- int columns, rows, numPixels;
- byte *pixbuf;
- int row, column;
- byte *image_rgba;
-
- targa_header.id_length = fgetc(fin);
- targa_header.colormap_type = fgetc(fin);
- targa_header.image_type = fgetc(fin);
-
- targa_header.colormap_index = fgetLittleShort(fin);
- targa_header.colormap_length = fgetLittleShort(fin);
- targa_header.colormap_size = fgetc(fin);
- targa_header.x_origin = fgetLittleShort(fin);
- targa_header.y_origin = fgetLittleShort(fin);
- targa_header.width = fgetLittleShort(fin);
- targa_header.height = fgetLittleShort(fin);
+ int columns, rows, row, column;
+ byte *pixbuf, *image_rgba, *fin, *enddata;
+
+ if (loadsize < 18+3)
+ return NULL;
+ targa_header.id_length = f[0];
+ targa_header.colormap_type = f[1];
+ targa_header.image_type = f[2];
+
+ targa_header.colormap_index = f[3] + f[4] * 256;
+ targa_header.colormap_length = f[5] + f[6] * 256;
+ targa_header.colormap_size = f[7];
+ targa_header.x_origin = f[8] + f[9] * 256;
+ targa_header.y_origin = f[10] + f[11] * 256;
+ targa_header.width = f[12] + f[13] * 256;
+ targa_header.height = f[14] + f[15] * 256;