Changeset 1705 for trunk/packages/vizservers

Timestamp:

Apr 19, 2010, 8:43:19 PM (14 years ago)

Author:

vrinside

Message:

supported RGBA BMP files

File:

• trunk/packages/vizservers/nanovis/imgLoaders/BMPImageLoaderImpl.cpp (modified) (1 diff)

trunk/packages/vizservers/nanovis/imgLoaders/BMPImageLoaderImpl.cpp

@@ -90 +90 @@
         }
         break;
+    case 32:
+        fseek(f,offset,SEEK_SET);
+        if (_targetImageFormat == Image::IMG_RGBA) {
+            if (fread(bytes,width*height*4,1,f) != 1) {
+                fprintf(stderr, "can't read image data\n");
+            }
+            for(x=0;x<width*height*4;x+=4)  { //except the format is BGR, grr
+                unsigned char temp = bytes[x];
+                bytes[x] = bytes[x+2];
+                bytes[x+2] = temp;
+            }
+        } 
+        else if (_targetImageFormat == Image::IMG_RGB) {
+            char* buff = (char*) malloc(width * height * sizeof(unsigned char) * 3);
+            if (fread(buff,width*height*4,1,f) != 1) {
+                fprintf(stderr, "can't read BMP image data\n");
+            }
+            for(x=0, y = 0;x<width*height*4;x+=4, y+=3)     {       //except the format is BGR, grr
+                bytes[y] = buff[x+2];
+                bytes[y+2] = buff[x];
+            }
+            free(buff);
+        }
+        break;
     case 8:
         if (fread(cols,256 * 4,1,f) != 1) {