Changeset 3095 in orxonox.OLD

Timestamp:

Dec 5, 2004, 2:04:17 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/images: jpeg made to one function, the function was really not used as a function, but as a gosub→return

Location:

orxonox/branches/images/importer

Files:

• material.cc (modified) (2 diffs)
• material.h (modified) (1 diff)

orxonox/branches/images/importer/material.cc

@@ -554 +554 @@
   pImage = (Image*)malloc(sizeof(Image));
   
-  // Decode the jpeg file and fill in the image data structure to pass back
-  decodeJPG(&cinfo, pImage);
+  // DECOFING
+  // Read in the header of the jpeg file
+  jpeg_read_header(&cinfo, TRUE);
+  
+  // Start to decompress the jpeg file with our compression info
+  jpeg_start_decompress(&cinfo);
+  
+  // Get the image dimensions and row span to read in the pixel data
+  pImage->rowSpan = cinfo.image_width * cinfo.num_components;
+  pImage->width   = cinfo.image_width;
+  pImage->height   = cinfo.image_height;
+  
+  // Allocate memory for the pixel buffer
+  pImage->data = new unsigned char[pImage->rowSpan * pImage->height];
+  
+  // Here we use the library's state variable cinfo.output_scanline as the
+  // loop counter, so that we don't have to keep track ourselves.
+  
+  // Create an array of row pointers
+  unsigned char** rowPtr = new unsigned char*[pImage->height];
+  for (int i = 0; i < pImage->height; i++)
+    rowPtr[i] = &(pImage->data[i*pImage->rowSpan]);
+  
+  // Now comes the juice of our work, here we extract all the pixel data
+  int rowsRead = 0;
+  while (cinfo.output_scanline < cinfo.output_height) 
+    {
+      // Read in the current row of pixels and increase the rowsRead count
+      rowsRead += jpeg_read_scanlines(&cinfo, &rowPtr[rowsRead], cinfo.output_height - rowsRead);
+    }
+  
+  // Delete the temporary row pointers
+  delete [] rowPtr;
+  
+  // Finish decompressing the data
+  jpeg_finish_decompress(&cinfo);//  decodeJPG(&cinfo, pImage);
   
   // This releases all the stored memory for reading and decoding the jpeg
@@ -579 +613 @@
   return true;
 }
-
-void Material::decodeJPG(jpeg_decompress_struct* cinfo, Image* pImageData)
-{
-  // Read in the header of the jpeg file
-  jpeg_read_header(cinfo, TRUE);
-  
-  // Start to decompress the jpeg file with our compression info
-  jpeg_start_decompress(cinfo);
-  
-  // Get the image dimensions and row span to read in the pixel data
-  pImageData->rowSpan = cinfo->image_width * cinfo->num_components;
-  pImageData->width   = cinfo->image_width;
-  pImageData->height   = cinfo->image_height;
-  
-  // Allocate memory for the pixel buffer
-  pImageData->data = new unsigned char[pImageData->rowSpan * pImageData->height];
-  
-  // Here we use the library's state variable cinfo.output_scanline as the
-  // loop counter, so that we don't have to keep track ourselves.
-  
-  // Create an array of row pointers
-  unsigned char** rowPtr = new unsigned char*[pImageData->height];
-  for (int i = 0; i < pImageData->height; i++)
-    rowPtr[i] = &(pImageData->data[i*pImageData->rowSpan]);
-  
-  // Now comes the juice of our work, here we extract all the pixel data
-  int rowsRead = 0;
-  while (cinfo->output_scanline < cinfo->output_height) 
-    {
-      // Read in the current row of pixels and increase the rowsRead count
-      rowsRead += jpeg_read_scanlines(cinfo, &rowPtr[rowsRead], cinfo->output_height - rowsRead);
-    }
-  
-  // Delete the temporary row pointers
-  delete [] rowPtr;
-  
-  // Finish decompressing the data
-  jpeg_finish_decompress(cinfo);
-}
-
-
-
 
 bool Material::loadTGA(const char * tgaName, GLuint* texture)

orxonox/branches/images/importer/material.h

@@ -95 +95 @@
 
   bool loadJPG (char* jpgName, GLuint* texture);
-  void decodeJPG(jpeg_decompress_struct* cinfo, Image *pImageData);
 
   /// TGA ///