comparison src/dgif_lib.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5
author cvs
date Mon, 13 Aug 2007 11:07:10 +0200
parents d883f39b8495
children de805c49cfc1
comparison
equal deleted inserted replaced
379:76b7d63099ad 380:8626e4521993
110 /* The GIF Version number is ignored at this time. Maybe we should do */ 110 /* The GIF Version number is ignored at this time. Maybe we should do */
111 /* something more useful with it. */ 111 /* something more useful with it. */
112 Buf[GIF_STAMP_LEN] = 0; 112 Buf[GIF_STAMP_LEN] = 0;
113 if (strncmp(GIF_STAMP, (const char *) Buf, GIF_VERSION_POS) != 0) { 113 if (strncmp(GIF_STAMP, (const char *) Buf, GIF_VERSION_POS) != 0) {
114 GifInternError(GifFile, D_GIF_ERR_NOT_GIF_FILE); 114 GifInternError(GifFile, D_GIF_ERR_NOT_GIF_FILE);
115 } 115 }
116 116
117 DGifGetScreenDesc(GifFile); 117 DGifGetScreenDesc(GifFile);
118 } 118 }
119 119
120 /****************************************************************************** 120 /******************************************************************************
247 { 247 {
248 sp->ImageDesc.ColorMap = 248 sp->ImageDesc.ColorMap =
249 MakeMapObject (GifFile->Image.ColorMap->ColorCount, 249 MakeMapObject (GifFile->Image.ColorMap->ColorCount,
250 GifFile->Image.ColorMap->Colors); 250 GifFile->Image.ColorMap->Colors);
251 } 251 }
252 sp->RasterBits = (GifPixelType *)NULL; 252 sp->RasterBits = NULL;
253 sp->ExtensionBlockCount = 0; 253 sp->ExtensionBlockCount = 0;
254 sp->ExtensionBlocks = (ExtensionBlock *)NULL; 254 sp->ExtensionBlocks = (ExtensionBlock *)NULL;
255 } 255 }
256 256
257 GifFile->ImageCount++; 257 GifFile->ImageCount++;
743 743
744 sp = &GifFile->SavedImages[GifFile->ImageCount-1]; 744 sp = &GifFile->SavedImages[GifFile->ImageCount-1];
745 ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height; 745 ImageSize = sp->ImageDesc.Width * sp->ImageDesc.Height;
746 746
747 sp->RasterBits 747 sp->RasterBits
748 = (GifPixelType*) malloc(ImageSize * sizeof(GifPixelType)); 748 = (GifPixelType*) malloc (ImageSize * sizeof(GifPixelType));
749 749
750 DGifGetLine(GifFile, sp->RasterBits, ImageSize); 750 DGifGetLine(GifFile, sp->RasterBits, ImageSize);
751 break; 751 break;
752 752
753 case EXTENSION_RECORD_TYPE: 753 case EXTENSION_RECORD_TYPE:
854 sp->ImageDesc.ColorMap = 854 sp->ImageDesc.ColorMap =
855 MakeMapObject(CopyFrom->ImageDesc.ColorMap->ColorCount, 855 MakeMapObject(CopyFrom->ImageDesc.ColorMap->ColorCount,
856 CopyFrom->ImageDesc.ColorMap->Colors); 856 CopyFrom->ImageDesc.ColorMap->Colors);
857 857
858 /* next, the raster */ 858 /* next, the raster */
859 sp->RasterBits = (GifPixelType*)malloc(sizeof(GifPixelType) 859 sp->RasterBits = (GifPixelType *) malloc(sizeof(GifPixelType)
860 * CopyFrom->ImageDesc.Height 860 * CopyFrom->ImageDesc.Height
861 * CopyFrom->ImageDesc.Width); 861 * CopyFrom->ImageDesc.Width);
862 memcpy(sp->RasterBits, 862 memcpy(sp->RasterBits,
863 CopyFrom->RasterBits, 863 CopyFrom->RasterBits,
864 sizeof(GifPixelType) 864 sizeof(GifPixelType)
909 909
910 /****************************************************************************** 910 /******************************************************************************
911 * Miscellaneous utility functions * 911 * Miscellaneous utility functions *
912 ******************************************************************************/ 912 ******************************************************************************/
913 913
914 int BitSize(int n) 914 static int BitSize(int n)
915 /* return smallest bitfield size n will fit in */ 915 /* return smallest bitfield size n will fit in */
916 { 916 {
917 register int i; 917 register int i;
918 918
919 for (i = 1; i <= 8; i++) 919 for (i = 1; i <= 8; i++)