Changeset 1380 for trunk/packages/vizservers/nanovis/imgLoaders

Timestamp:

Apr 4, 2009, 4:49:00 PM (15 years ago)

Author:

gah

Message:

 

File:

• trunk/packages/vizservers/nanovis/imgLoaders/BMPImageLoaderImpl.cpp (modified) (4 diffs)

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

@@ -29 +29 @@
 
     char header[54];
-    fread(&header, 54, 1, f);
+    if (fread(&header, 54, 1, f) != 1) {
+        printf("can't read header of BMP file\n");
+        return 0;
+    };
 
     if (header[0] != 'B' ||  header[1] != 'M') {
@@ -66 +69 @@
         fseek(f,offset,SEEK_SET);
         if (_targetImageFormat == Image::IMG_RGB) {
-            fread(bytes,width*height*3,1,f); //24bit is easy
+            if (fread(bytes,width*height*3,1,f) != 1) {
+                fprintf(stderr, "can't read image data\n");
+            }
             for(x=0;x<width*height*3;x+=3)  { //except the format is BGR, grr
                 unsigned char temp = bytes[x];
@@ -74 +79 @@
         } else if (_targetImageFormat == Image::IMG_RGBA) {
             char* buff = (char*) malloc(width * height * sizeof(unsigned char) * 3);
-            fread(buff,width*height*3,1,f);                 //24bit is easy
+            if (fread(buff,width*height*3,1,f) != 1) {
+                fprintf(stderr, "can't read BMP image data\n");
+            }
             for(x=0, y = 0;x<width*height*3;x+=3, y+=4)     {       //except the format is BGR, grr
                 bytes[y] = buff[x+2];
@@ -84 +91 @@
         break;
     case 8:
-        fread(cols,256 * 4,1,f); //read colortable
+        if (fread(cols,256 * 4,1,f) != 1) {
+            fprintf(stderr, "can't read colortable from BMP file\n");
+        }
         fseek(f,offset,SEEK_SET);  
         for(y=0;y<height;++y) { //(Notice 4bytes/col for some reason)
             for(x=0;x<width;++x) {
                 unsigned char byte;                 
-                fread(&byte,1,1,f);                                                 //just read byte                                        
+                if (fread(&byte,1,1,f) != 1) {
+                    fprintf(stderr, "error reading BMP file\n");
+                }
                 for(int c=0; c< 3; ++c) {
                     //bytes[(y*width+x)*3+c] = cols[byte*4+2-c];        //and look up in the table