From c2f3f4856ccff97dc49f4f0663b7b6293ada563e Mon Sep 17 00:00:00 2001 From: Andreas Schiffler Date: Sun, 3 Feb 2013 08:37:28 -0800 Subject: [PATCH] Added VS2010 and VS2012 projects; updates for VS compile; fixes from VS code analysis and code review --- IMG.c | 2 +- IMG_bmp.c | 14 +- IMG_gif.c | 31 +- IMG_jpg.c | 12 +- IMG_lbm.c | 42 +-- IMG_pcx.c | 32 +- IMG_png.c | 24 +- IMG_pnm.c | 8 +- IMG_tga.c | 28 +- IMG_tif.c | 10 +- IMG_webp.c | 16 +- IMG_xcf.c | 37 +- IMG_xpm.c | 54 +-- IMG_xv.c | 12 +- VisualC/SDL_image_VS2010.sln | 36 ++ VisualC/SDL_image_VS2010.vcxproj | 398 ++++++++++++++++++++ VisualC/SDL_image_VS2012.sln | 36 ++ VisualC/SDL_image_VS2012.vcxproj | 402 +++++++++++++++++++++ VisualC/showimage/showimage_VS2010.vcxproj | 285 +++++++++++++++ VisualC/showimage/showimage_VS2012.vcxproj | 289 +++++++++++++++ 20 files changed, 1615 insertions(+), 153 deletions(-) create mode 100644 VisualC/SDL_image_VS2010.sln create mode 100644 VisualC/SDL_image_VS2010.vcxproj create mode 100644 VisualC/SDL_image_VS2012.sln create mode 100644 VisualC/SDL_image_VS2012.vcxproj create mode 100644 VisualC/showimage/showimage_VS2010.vcxproj create mode 100644 VisualC/showimage/showimage_VS2012.vcxproj diff --git a/IMG.c b/IMG.c index b213a5f8..433ecea7 100644 --- a/IMG.c +++ b/IMG.c @@ -123,7 +123,7 @@ void IMG_Quit() SDL_Surface *IMG_Load(const char *file) { SDL_RWops *src = SDL_RWFromFile(file, "rb"); - char *ext = strrchr(file, '.'); + const char *ext = strrchr(file, '.'); if(ext) { ext++; } diff --git a/IMG_bmp.c b/IMG_bmp.c index de2fe5f1..bba5e715 100644 --- a/IMG_bmp.c +++ b/IMG_bmp.c @@ -35,7 +35,7 @@ /* See if an image is contained in a data source */ int IMG_isBMP(SDL_RWops *src) { - int start; + Sint64 start; int is_BMP; char magic[2]; @@ -44,7 +44,7 @@ int IMG_isBMP(SDL_RWops *src) start = SDL_RWtell(src); is_BMP = 0; if ( SDL_RWread(src, magic, sizeof(magic), 1) ) { - if ( strncmp(magic, "BM", 2) == 0 ) { + if ( SDL_strncmp(magic, "BM", 2) == 0 ) { is_BMP = 1; } } @@ -54,7 +54,7 @@ int IMG_isBMP(SDL_RWops *src) static int IMG_isICOCUR(SDL_RWops *src, int type) { - int start; + Sint64 start; int is_ICOCUR; /* The Win32 ICO file header (14 bytes) */ @@ -187,7 +187,7 @@ static int readRlePixels(SDL_Surface * surface, SDL_RWops * src, int isRle8) static SDL_Surface *LoadBMP_RW (SDL_RWops *src, int freesrc) { SDL_bool was_error; - long fp_offset; + Sint64 fp_offset; int bmpPitch; int i, pad; SDL_Surface *surface; @@ -237,7 +237,7 @@ static SDL_Surface *LoadBMP_RW (SDL_RWops *src, int freesrc) was_error = SDL_TRUE; goto done; } - if ( strncmp(magic, "BM", 2) != 0 ) { + if ( SDL_strncmp(magic, "BM", 2) != 0 ) { IMG_SetError("File is not a Windows BMP file"); was_error = SDL_TRUE; goto done; @@ -404,7 +404,7 @@ static SDL_Surface *LoadBMP_RW (SDL_RWops *src, int freesrc) goto done; } if ((biCompression == BI_RLE4) || (biCompression == BI_RLE8)) { - was_error = readRlePixels(surface, src, biCompression == BI_RLE8); + was_error = (SDL_bool)readRlePixels(surface, src, biCompression == BI_RLE8); if (was_error) IMG_SetError("Error reading from BMP"); goto done; } @@ -520,7 +520,7 @@ static SDL_Surface * LoadICOCUR_RW(SDL_RWops * src, int type, int freesrc) { SDL_bool was_error; - long fp_offset; + Sint64 fp_offset; int bmpPitch; int i, pad; SDL_Surface *surface; diff --git a/IMG_gif.c b/IMG_gif.c index 567c6036..fbf136c8 100644 --- a/IMG_gif.c +++ b/IMG_gif.c @@ -33,7 +33,7 @@ /* See if an image is contained in a data source */ int IMG_isGIF(SDL_RWops *src) { - int start; + Sint64 start; int is_GIF; char magic[6]; @@ -42,9 +42,9 @@ int IMG_isGIF(SDL_RWops *src) start = SDL_RWtell(src); is_GIF = 0; if ( SDL_RWread(src, magic, sizeof(magic), 1) ) { - if ( (strncmp(magic, "GIF", 3) == 0) && - ((memcmp(magic + 3, "87a", 3) == 0) || - (memcmp(magic + 3, "89a", 3) == 0)) ) { + if ( (SDL_strncmp(magic, "GIF", 3) == 0) && + ((SDL_memcmp(magic + 3, "87a", 3) == 0) || + (SDL_memcmp(magic + 3, "89a", 3) == 0)) ) { is_GIF = 1; } } @@ -152,7 +152,7 @@ static Image *ReadImage(SDL_RWops * src, int len, int height, int, Image * IMG_LoadGIF_RW(SDL_RWops *src) { - int start; + Sint64 start; unsigned char buf[16]; unsigned char c; unsigned char localColorMap[3][MAXCOLORMAPSIZE]; @@ -173,14 +173,14 @@ IMG_LoadGIF_RW(SDL_RWops *src) RWSetMsg("error reading magic number"); goto done; } - if (strncmp((char *) buf, "GIF", 3) != 0) { + if (SDL_strncmp((char *) buf, "GIF", 3) != 0) { RWSetMsg("not a GIF file"); goto done; } - memcpy(version, (char *) buf + 3, 3); + SDL_memcpy(version, (char *) buf + 3, 3); version[3] = '\0'; - if ((strcmp(version, "87a") != 0) && (strcmp(version, "89a") != 0)) { + if ((SDL_strcmp(version, "87a") != 0) && (SDL_strcmp(version, "89a") != 0)) { RWSetMsg("bad version number, not '87a' or '89a'"); goto done; } @@ -337,7 +337,7 @@ DoExtension(SDL_RWops *src, int label) return FALSE; default: str = (char *)buf; - sprintf(str, "UNKNOWN (0x%02x)", label); + SDL_snprintf(str, 256, "UNKNOWN (0x%02x)", label); break; } @@ -439,8 +439,9 @@ LWZReadByte(SDL_RWops *src, int flag, int input_code_size) table[0][i] = 0; table[1][i] = i; } + table[1][0] = 0; for (; i < (1 << MAX_LWZ_BITS); ++i) - table[0][i] = table[1][0] = 0; + table[0][i] = 0; sp = stack; @@ -493,12 +494,22 @@ LWZReadByte(SDL_RWops *src, int flag, int input_code_size) code = oldcode; } while (code >= clear_code) { + /* Guard against buffer overruns */ + if (code < 0 || code >= (1 << MAX_LWZ_BITS)) { + RWSetMsg("invalid LWZ data"); + return -3; + } *sp++ = table[1][code]; if (code == table[0][code]) RWSetMsg("circular table entry BIG ERROR"); code = table[0][code]; } + /* Guard against buffer overruns */ + if (code < 0 || code >= (1 << MAX_LWZ_BITS)) { + RWSetMsg("invalid LWZ data"); + return -4; + } *sp++ = firstcode = table[1][code]; if ((code = max_code) < (1 << MAX_LWZ_BITS)) { diff --git a/IMG_jpg.c b/IMG_jpg.c index fe8184a3..7ae8a0d5 100644 --- a/IMG_jpg.c +++ b/IMG_jpg.c @@ -177,7 +177,7 @@ void IMG_QuitJPG() /* See if an image is contained in a data source */ int IMG_isJPG(SDL_RWops *src) { - int start; + Sint64 start; int is_JPG; int in_scan; Uint8 magic[4]; @@ -214,13 +214,13 @@ int IMG_isJPG(SDL_RWops *src) is_JPG = 0; } else { /* Yes, it's big-endian */ - Uint32 start; + Sint64 innerStart; Uint32 size; - Uint32 end; - start = SDL_RWtell(src); + Sint64 end; + innerStart = SDL_RWtell(src); size = (magic[2] << 8) + magic[3]; end = SDL_RWseek(src, size-2, RW_SEEK_CUR); - if ( end != start + size - 2 ) is_JPG = 0; + if ( end != innerStart + size - 2 ) is_JPG = 0; if ( magic[1] == 0xDA ) { /* Now comes the actual JPEG meat */ #ifdef FAST_IS_JPEG @@ -374,7 +374,7 @@ static void output_no_message(j_common_ptr cinfo) /* Load a JPEG type image from an SDL datasource */ SDL_Surface *IMG_LoadJPG_RW(SDL_RWops *src) { - int start; + Sint64 start; struct jpeg_decompress_struct cinfo; JSAMPROW rowptr[1]; SDL_Surface *volatile surface = NULL; diff --git a/IMG_lbm.c b/IMG_lbm.c index f50f92dc..9816dfc2 100644 --- a/IMG_lbm.c +++ b/IMG_lbm.c @@ -61,7 +61,7 @@ typedef struct int IMG_isLBM( SDL_RWops *src ) { - int start; + Sint64 start; int is_LBM; Uint8 magic[4+4+4]; @@ -71,9 +71,9 @@ int IMG_isLBM( SDL_RWops *src ) is_LBM = 0; if ( SDL_RWread( src, magic, sizeof(magic), 1 ) ) { - if ( !memcmp( magic, "FORM", 4 ) && - ( !memcmp( magic + 8, "PBM ", 4 ) || - !memcmp( magic + 8, "ILBM", 4 ) ) ) + if ( !SDL_memcmp( magic, "FORM", 4 ) && + ( !SDL_memcmp( magic + 8, "PBM ", 4 ) || + !SDL_memcmp( magic + 8, "ILBM", 4 ) ) ) { is_LBM = 1; } @@ -84,7 +84,7 @@ int IMG_isLBM( SDL_RWops *src ) SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) { - int start; + Sint64 start; SDL_Surface *Image; Uint8 id[4], pbm, colormap[MAXCOLORS*3], *MiniBuf, *ptr, count, color, msk; Uint32 size, bytesloaded, nbcolors; @@ -135,8 +135,8 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) pbm = 0; /* File format : PBM=Packed Bitmap, ILBM=Interleaved Bitmap */ - if ( !memcmp( id, "PBM ", 4 ) ) pbm = 1; - else if ( memcmp( id, "ILBM", 4 ) ) + if ( !SDL_memcmp( id, "PBM ", 4 ) ) pbm = 1; + else if ( SDL_memcmp( id, "ILBM", 4 ) ) { error="not a IFF picture"; goto done; @@ -144,11 +144,11 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) nbcolors = 0; - memset( &bmhd, 0, sizeof( BMHD ) ); + SDL_memset( &bmhd, 0, sizeof( BMHD ) ); flagHAM = 0; flagEHB = 0; - while ( memcmp( id, "BODY", 4 ) != 0 ) + while ( SDL_memcmp( id, "BODY", 4 ) != 0 ) { if ( !SDL_RWread( src, id, 4, 1 ) ) { @@ -166,7 +166,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) size = SDL_SwapBE32( size ); - if ( !memcmp( id, "BMHD", 4 ) ) /* Bitmap header */ + if ( !SDL_memcmp( id, "BMHD", 4 ) ) /* Bitmap header */ { if ( !SDL_RWread( src, &bmhd, sizeof( BMHD ), 1 ) ) { @@ -185,7 +185,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) bmhd.Hpage = SDL_SwapBE16( bmhd.Hpage ); } - if ( !memcmp( id, "CMAP", 4 ) ) /* palette ( Color Map ) */ + if ( !SDL_memcmp( id, "CMAP", 4 ) ) /* palette ( Color Map ) */ { if ( !SDL_RWread( src, &colormap, size, 1 ) ) { @@ -214,7 +214,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) flagEHB = 1; } - if ( memcmp( id, "BODY", 4 ) ) + if ( SDL_memcmp( id, "BODY", 4 ) ) { if ( size & 1 ) ++size; /* padding ! */ size -= bytesloaded; @@ -242,7 +242,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) /* Allocate memory for a temporary buffer ( used for decompression/deinterleaving ) */ - MiniBuf = (void *)malloc( bytesperline * (nbplanes + stencil) ); + MiniBuf = (Uint8 *)SDL_malloc( bytesperline * (nbplanes + stencil) ); if ( MiniBuf == NULL ) { error="no enough memory for temporary buffer"; @@ -335,7 +335,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) error="error reading BODY chunk"; goto done; } - memset( ptr, color, count ); + SDL_memset( ptr, color, count ); } else { @@ -365,7 +365,7 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) /* One line has been read, store it ! */ - ptr = Image->pixels; + ptr = (Uint8 *)Image->pixels; if ( nbplanes==24 || flagHAM==1 ) ptr += h * width * 3; else @@ -449,19 +449,15 @@ SDL_Surface *IMG_LoadLBM_RW( SDL_RWops *src ) { finalcolor = pixelcolor; } - if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) - { +#if SDL_BYTEORDER == SDL_LIL_ENDIAN *ptr++ = (Uint8)(finalcolor>>16); *ptr++ = (Uint8)(finalcolor>>8); *ptr++ = (Uint8)(finalcolor); - } - else - { - *ptr++ = (Uint8)(finalcolor); +#else + *ptr++ = (Uint8)(finalcolor); *ptr++ = (Uint8)(finalcolor>>8); *ptr++ = (Uint8)(finalcolor>>16); - } - +#endif maskBit = maskBit>>1; } } diff --git a/IMG_pcx.c b/IMG_pcx.c index 2243f439..4b997c10 100644 --- a/IMG_pcx.c +++ b/IMG_pcx.c @@ -61,7 +61,7 @@ struct PCXheader { /* See if an image is contained in a data source */ int IMG_isPCX(SDL_RWops *src) { - int start; + Sint64 start; int is_PCX; const int ZSoft_Manufacturer = 10; const int PC_Paintbrush_Version = 5; @@ -88,7 +88,7 @@ int IMG_isPCX(SDL_RWops *src) /* Load a PCX type image from an SDL datasource */ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src) { - int start; + Sint64 start; struct PCXheader pcxh; Uint32 Rmask; Uint32 Gmask; @@ -127,15 +127,15 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src) bits = 8; } else if(pcxh.BitsPerPixel == 8 && pcxh.NPlanes == 3) { bits = 24; - if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) { +#if SDL_BYTEORDER == SDL_LIL_ENDIAN Rmask = 0x000000FF; Gmask = 0x0000FF00; Bmask = 0x00FF0000; - } else { +#else Rmask = 0xFF0000; Gmask = 0x00FF00; Bmask = 0x0000FF; - } +#endif } else { error = "unsupported PCX format"; goto done; @@ -149,8 +149,8 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src) if (bpl > surface->pitch) { error = "bytes per line is too large (corrupt?)"; } - buf = malloc(bpl); - row = surface->pixels; + buf = (Uint8 *)malloc(bpl); + row = (Uint8 *)surface->pixels; for ( y=0; yh; ++y ) { /* decode a scan line to a temporary buffer first */ int i, count = 0; @@ -184,16 +184,16 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src) if(src_bits <= 4) { /* expand planes to 1 byte/pixel */ - Uint8 *src = buf; + Uint8 *innerSrc = buf; int plane; for(plane = 0; plane < pcxh.NPlanes; plane++) { - int i, j, x = 0; - for(i = 0; i < pcxh.BytesPerLine; i++) { - Uint8 byte = *src++; - for(j = 7; j >= 0; j--) { - unsigned bit = (byte >> j) & 1; + int j, k, x = 0; + for(j = 0; j < pcxh.BytesPerLine; j++) { + Uint8 byte = *innerSrc++; + for(k = 7; k >= 0; k--) { + unsigned bit = (byte >> k) & 1; /* skip padding bits */ - if (i * 8 + j >= width) + if (j * 8 + k >= width) continue; row[x++] |= bit << plane; } @@ -201,13 +201,13 @@ SDL_Surface *IMG_LoadPCX_RW(SDL_RWops *src) } } else if(src_bits == 24) { /* de-interlace planes */ - Uint8 *src = buf; + Uint8 *innerSrc = buf; int plane; for(plane = 0; plane < pcxh.NPlanes; plane++) { int x; dst = row + plane; for(x = 0; x < width; x++) { - *dst = *src++; + *dst = *innerSrc++; dst += pcxh.NPlanes; } } diff --git a/IMG_png.c b/IMG_png.c index cd135f01..dffb286d 100644 --- a/IMG_png.c +++ b/IMG_png.c @@ -303,7 +303,7 @@ void IMG_QuitPNG() /* See if an image is contained in a data source */ int IMG_isPNG(SDL_RWops *src) { - int start; + Sint64 start; int is_PNG; Uint8 magic[4]; @@ -333,7 +333,7 @@ static void png_read_data(png_structp ctx, png_bytep area, png_size_t size) } SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) { - int start; + Sint64 start; const char *error; SDL_Surface *volatile surface; png_structp png_ptr; @@ -423,15 +423,15 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) &transv); if(color_type == PNG_COLOR_TYPE_PALETTE) { /* Check if all tRNS entries are opaque except one */ - int i, t = -1; - for(i = 0; i < num_trans; i++) - if(trans[i] == 0) { + int j, t = -1; + for(j = 0; j < num_trans; j++) + if(trans[j] == 0) { if(t >= 0) break; t = i; - } else if(trans[i] != 255) + } else if(trans[j] != 255) break; - if(i == num_trans) { + if(j == num_trans) { /* exactly one transparent index */ ckey = t; } else { @@ -454,18 +454,18 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) Rmask = Gmask = Bmask = Amask = 0 ; num_channels = lib.png_get_channels(png_ptr, info_ptr); if ( color_type != PNG_COLOR_TYPE_PALETTE ) { - if ( SDL_BYTEORDER == SDL_LIL_ENDIAN ) { +#if SDL_BYTEORDER == SDL_LIL_ENDIAN Rmask = 0x000000FF; Gmask = 0x0000FF00; Bmask = 0x00FF0000; Amask = (num_channels == 4) ? 0xFF000000 : 0; - } else { +#else int s = (num_channels == 4) ? 0 : 8; Rmask = 0xFF000000 >> s; Gmask = 0x00FF0000 >> s; Bmask = 0x0000FF00 >> s; Amask = 0x000000FF >> s; - } +#endif } surface = SDL_CreateRGBSurface(SDL_SWSURFACE, width, height, bit_depth*num_channels, Rmask,Gmask,Bmask,Amask); @@ -485,7 +485,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) } /* Create the array of pointers to image data */ - row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*height); + row_pointers = (png_bytep*) SDL_malloc(sizeof(png_bytep)*height); if ( (row_pointers == NULL) ) { error = "Out of memory"; goto done; @@ -536,7 +536,7 @@ SDL_Surface *IMG_LoadPNG_RW(SDL_RWops *src) (png_infopp)0); } if ( row_pointers ) { - free(row_pointers); + SDL_free(row_pointers); } if ( error ) { SDL_RWseek(src, start, RW_SEEK_SET); diff --git a/IMG_pnm.c b/IMG_pnm.c index 3eb8f143..079dddf6 100644 --- a/IMG_pnm.c +++ b/IMG_pnm.c @@ -39,7 +39,7 @@ /* See if an image is contained in a data source */ int IMG_isPNM(SDL_RWops *src) { - int start; + Sint64 start; int is_PNM; char magic[2]; @@ -105,7 +105,7 @@ static int ReadNumber(SDL_RWops *src) SDL_Surface *IMG_LoadPNM_RW(SDL_RWops *src) { - int start; + Sint64 start; SDL_Surface *surface = NULL; int width, height; int maxval, y, bpl; @@ -177,13 +177,13 @@ SDL_Surface *IMG_LoadPNM_RW(SDL_RWops *src) c[1].r = c[1].g = c[1].b = 0; surface->format->palette->ncolors = 2; bpl = (width + 7) >> 3; - buf = malloc(bpl); + buf = (Uint8 *)SDL_malloc(bpl); if(buf == NULL) ERROR("Out of memory"); } /* Read the image into the surface */ - row = surface->pixels; + row = (Uint8 *)surface->pixels; for(y = 0; y < height; y++) { if(ascii) { int i; diff --git a/IMG_tga.c b/IMG_tga.c index bb04fe6d..a0e25917 100644 --- a/IMG_tga.c +++ b/IMG_tga.c @@ -87,7 +87,7 @@ enum tga_type { /* Load a TGA type image from an SDL datasource */ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) { - int start; + Sint64 start; const char *error = NULL; struct TGAheader hdr; int rle = 0; @@ -169,18 +169,20 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) alpha = 1; /* fallthrough */ case 24: - if(SDL_BYTEORDER == SDL_BIG_ENDIAN) { +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + { int s = alpha ? 0 : 8; amask = 0x000000ff >> s; rmask = 0x0000ff00 >> s; gmask = 0x00ff0000 >> s; bmask = 0xff000000 >> s; - } else { + } +#else amask = alpha ? 0xff000000 : 0; rmask = 0x00ff0000; gmask = 0x0000ff00; bmask = 0x000000ff; - } +#endif break; default: @@ -207,7 +209,7 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) if(hdr.has_cmap) { int palsiz = ncols * ((hdr.cmap_bits + 7) >> 3); if(indexed && !grey) { - Uint8 *pal = malloc(palsiz), *p = pal; + Uint8 *pal = (Uint8 *)SDL_malloc(palsiz), *p = pal; SDL_Color *colors = img->format->palette->colors; img->format->palette->ncolors = ncols; SDL_RWread(src, pal, palsiz, 1); @@ -233,7 +235,7 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) break; } } - free(pal); + SDL_free(pal); if(ckey >= 0) SDL_SetColorKey(img, SDL_TRUE, ckey); } else { @@ -250,11 +252,11 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) } if(hdr.flags & TGA_ORIGIN_UPPER) { - lstep = img->pitch; - dst = img->pixels; + lstep = img->pitch; + dst = (Uint8 *)img->pixels; } else { - lstep = -img->pitch; - dst = (Uint8 *)img->pixels + (h - 1) * img->pitch; + lstep = -img->pitch; + dst = (Uint8 *)img->pixels + (h - 1) * img->pitch; } /* The RLE decoding code is slightly convoluted since we can't rely on @@ -281,7 +283,7 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) n = w - x; rep -= n; while(n--) { - memcpy(dst + x * bpp, &pixel, bpp); + SDL_memcpy(dst + x * bpp, &pixel, bpp); x++; } if(x == w) @@ -300,13 +302,15 @@ SDL_Surface *IMG_LoadTGA_RW(SDL_RWops *src) } else { SDL_RWread(src, dst, w * bpp, 1); } - if(SDL_BYTEORDER == SDL_BIG_ENDIAN && bpp == 2) { +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + if (bpp == 2) { /* swap byte order */ int x; Uint16 *p = (Uint16 *)dst; for(x = 0; x < w; x++) p[x] = SDL_Swap16(p[x]); } +#endif dst += lstep; } return img; diff --git a/IMG_tif.c b/IMG_tif.c index e97485a0..a429d08e 100644 --- a/IMG_tif.c +++ b/IMG_tif.c @@ -165,19 +165,19 @@ static void tiff_unmap(thandle_t fd, tdata_t base, toff_t size) static toff_t tiff_size(thandle_t fd) { - Uint32 save_pos; + Sint64 save_pos; toff_t size; save_pos = SDL_RWtell((SDL_RWops*)fd); SDL_RWseek((SDL_RWops*)fd, 0, RW_SEEK_END); - size = SDL_RWtell((SDL_RWops*)fd); + size = SDL_RWtell((SDL_RWops*)fd); SDL_RWseek((SDL_RWops*)fd, save_pos, RW_SEEK_SET); return size; } int IMG_isTIF(SDL_RWops* src) { - int start; + Sint64 start; int is_TIF; Uint8 magic[4]; @@ -203,7 +203,7 @@ int IMG_isTIF(SDL_RWops* src) SDL_Surface* IMG_LoadTIF_RW(SDL_RWops* src) { - int start; + Sint64 start; TIFF* tiff; SDL_Surface* surface = NULL; Uint32 img_width, img_height; @@ -240,7 +240,7 @@ SDL_Surface* IMG_LoadTIF_RW(SDL_RWops* src) if(!surface) goto error; - if(!lib.TIFFReadRGBAImage(tiff, img_width, img_height, surface->pixels, 0)) + if(!lib.TIFFReadRGBAImage(tiff, img_width, img_height, (uint32 *)surface->pixels, 0)) goto error; /* libtiff loads the image upside-down, flip it back */ diff --git a/IMG_webp.c b/IMG_webp.c index 26d1a1ad..39c77487 100644 --- a/IMG_webp.c +++ b/IMG_webp.c @@ -122,7 +122,7 @@ void IMG_QuitWEBP() #endif /* LOAD_WEBP_DYNAMIC */ static int webp_getinfo( SDL_RWops *src, int *datasize ) { - int start; + Sint64 start; int is_WEBP; int data; Uint8 magic[20]; @@ -162,7 +162,7 @@ int IMG_isWEBP(SDL_RWops *src) SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) { - int start; + Sint64 start; const char *error = NULL; SDL_Surface *volatile surface = NULL; Uint32 Rmask; @@ -171,7 +171,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) Uint32 Amask; WebPBitstreamFeatures features; int raw_data_size; - uint8_t *raw_data; + uint8_t *raw_data = NULL; int r; uint8_t *ret; @@ -196,7 +196,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) // skip header SDL_RWseek(src, start+20, RW_SEEK_SET ); - raw_data = (uint8_t*) malloc( raw_data_size ); + raw_data = (uint8_t*) SDL_malloc( raw_data_size ); if ( raw_data == NULL ) { error = "Failed to allocate enought buffer for WEBP"; goto error; @@ -219,7 +219,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) if ( lib.webp_get_features_internal( raw_data, raw_data_size, &features, WEBP_DECODER_ABI_VERSION ) != VP8_STATUS_OK ) { error = "WebPGetFeatures has failed"; - return NULL; + goto error; } /* Check if it's ok !*/ @@ -238,9 +238,9 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) } if ( features.has_alpha ) { - ret = lib.webp_decode_rgba_into( raw_data, raw_data_size, surface->pixels, surface->pitch * surface->h, surface->pitch ); + ret = lib.webp_decode_rgba_into( raw_data, raw_data_size, (uint8_t *)surface->pixels, surface->pitch * surface->h, surface->pitch ); } else { - ret = lib.webp_decode_rgb_into( raw_data, raw_data_size, surface->pixels, surface->pitch * surface->h, surface->pitch ); + ret = lib.webp_decode_rgb_into( raw_data, raw_data_size, (uint8_t *)surface->pixels, surface->pitch * surface->h, surface->pitch ); } if ( !ret ) { @@ -258,7 +258,7 @@ SDL_Surface *IMG_LoadWEBP_RW(SDL_RWops *src) } if ( raw_data ) { - free( raw_data ); + SDL_free( raw_data ); } if ( error ) { diff --git a/IMG_xcf.c b/IMG_xcf.c index bc566b13..5de4c699 100644 --- a/IMG_xcf.c +++ b/IMG_xcf.c @@ -208,7 +208,7 @@ typedef unsigned char * (* load_tile_type) (SDL_RWops *, Uint32, int, int, int); /* See if an image is contained in a data source */ int IMG_isXCF(SDL_RWops *src) { - int start; + Sint64 start; int is_XCF; char magic[14]; @@ -217,7 +217,7 @@ int IMG_isXCF(SDL_RWops *src) start = SDL_RWtell(src); is_XCF = 0; if ( SDL_RWread(src, magic, sizeof(magic), 1) ) { - if (strncmp(magic, "gimp xcf ", 9) == 0) { + if (SDL_strncmp(magic, "gimp xcf ", 9) == 0) { is_XCF = 1; } } @@ -311,12 +311,12 @@ static xcf_header * read_xcf_header (SDL_RWops * src) { do { xcf_read_property (src, &prop); if (prop.id == PROP_COMPRESSION) - h->compr = prop.data.compression; + h->compr = (xcf_compr_type)prop.data.compression; else if (prop.id == PROP_COLORMAP) { // unused var: int i; h->cm_num = prop.data.colormap.num; - h->cm_map = (unsigned char *) malloc (sizeof (unsigned char) * 3 * h->cm_num); + h->cm_map = (unsigned char *) SDL_malloc (sizeof (unsigned char) * 3 * h->cm_num); memcpy (h->cm_map, prop.data.colormap.cmap, 3*sizeof (char)*h->cm_num); free (prop.data.colormap.cmap); } @@ -366,7 +366,7 @@ static xcf_channel * read_xcf_channel (SDL_RWops * src) { xcf_channel * l; xcf_prop prop; - l = (xcf_channel *) malloc (sizeof (xcf_channel)); + l = (xcf_channel *) SDL_malloc (sizeof (xcf_channel)); l->width = SDL_ReadBE32 (src); l->height = SDL_ReadBE32 (src); @@ -433,14 +433,14 @@ static xcf_level * read_xcf_level (SDL_RWops * src) { xcf_level * l; int i; - l = (xcf_level *) malloc (sizeof (xcf_level)); + l = (xcf_level *) SDL_malloc (sizeof (xcf_level)); l->width = SDL_ReadBE32 (src); l->height = SDL_ReadBE32 (src); l->tile_file_offsets = NULL; i = 0; do { - l->tile_file_offsets = (Uint32 *) realloc (l->tile_file_offsets, sizeof (Uint32) * (i+1)); + l->tile_file_offsets = (Uint32 *) SDL_realloc (l->tile_file_offsets, sizeof (Uint32) * (i+1)); l->tile_file_offsets [i] = SDL_ReadBE32 (src); } while (l->tile_file_offsets [i++]); @@ -454,7 +454,7 @@ static void free_xcf_tile (unsigned char * t) { static unsigned char * load_xcf_tile_none (SDL_RWops * src, Uint32 len, int bpp, int x, int y) { unsigned char * load; - load = (unsigned char *) malloc (len); // expect this is okay + load = (unsigned char *) SDL_malloc (len); // expect this is okay SDL_RWread (src, load, len, 1); return load; @@ -466,7 +466,7 @@ static unsigned char * load_xcf_tile_rle (SDL_RWops * src, Uint32 len, int bpp, int i, size, count, j, length; unsigned char val; - t = load = (unsigned char *) malloc (len); + t = load = (unsigned char *) SDL_malloc (len); reallen = SDL_RWread (src, t, 1, len); data = (unsigned char *) malloc (x*y*bpp); @@ -514,15 +514,15 @@ static unsigned char * load_xcf_tile_rle (SDL_RWops * src, Uint32 len, int bpp, } } - free (load); + SDL_free (load); return (data); } static Uint32 rgb2grey (Uint32 a) { Uint8 l; - l = 0.2990 * ((a && 0x00FF0000) >> 16) + l = (Uint8)(0.2990 * ((a && 0x00FF0000) >> 16) + 0.5870 * ((a && 0x0000FF00) >> 8) - + 0.1140 * ((a && 0x000000FF)); + + 0.1140 * ((a && 0x000000FF))); return (l << 16) | (l << 8) | l; } @@ -549,7 +549,8 @@ static int do_layer_surface (SDL_Surface * surface, SDL_RWops * src, xcf_header Uint8 * p8; Uint16 * p16; Uint32 * p; - int x, y, tx, ty, ox, oy, i, j; + int i, j; + Uint32 x, y, tx, ty, ox, oy; Uint32 *row; SDL_RWseek (src, layer->hierarchy_file_offset, RW_SEEK_SET); @@ -673,14 +674,14 @@ static int do_layer_surface (SDL_Surface * surface, SDL_RWops * src, xcf_header SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src) { - int start; + Sint64 start; const char *error = NULL; SDL_Surface *surface, *lays; xcf_header * head; xcf_layer * layer; xcf_channel ** channel; int chnls, i, offsets; - Uint32 offset, fp; + Sint64 offset, fp; unsigned char * (* load_tile) (SDL_RWops *, Uint32, int, int, int); @@ -722,7 +723,7 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src) while ((offset = SDL_ReadBE32 (src))) { head->layer_file_offsets = (Uint32 *) realloc (head->layer_file_offsets, sizeof (Uint32) * (offsets+1)); - head->layer_file_offsets [offsets] = offset; + head->layer_file_offsets [offsets] = (Uint32)offset; offsets++; } fp = SDL_RWtell (src); @@ -764,7 +765,7 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src) channel = NULL; chnls = 0; while ((offset = SDL_ReadBE32 (src))) { - channel = (xcf_channel **) realloc (channel, sizeof (xcf_channel *) * (chnls+1)); + channel = (xcf_channel **) SDL_realloc (channel, sizeof (xcf_channel *) * (chnls+1)); fp = SDL_RWtell (src); SDL_RWseek (src, offset, RW_SEEK_SET); channel [chnls++] = (read_xcf_channel (src)); @@ -784,7 +785,7 @@ SDL_Surface *IMG_LoadXCF_RW(SDL_RWops *src) for (i = 0; i < chnls; i++) { // printf ("CNLBLT %i\n", i); if (!channel [i]->selection && channel [i]->visible) { - create_channel_surface (chs, head->image_type, channel [i]->color, channel [i]->opacity); + create_channel_surface (chs, (xcf_image_type)head->image_type, channel [i]->color, channel [i]->opacity); SDL_BlitSurface (chs, NULL, surface, NULL); } free_xcf_channel (channel [i]); diff --git a/IMG_xpm.c b/IMG_xpm.c index abfb05b9..3b478c2a 100644 --- a/IMG_xpm.c +++ b/IMG_xpm.c @@ -54,7 +54,7 @@ /* See if an image is contained in a data source */ int IMG_isXPM(SDL_RWops *src) { - int start; + Sint64 start; int is_XPM; char magic[9]; @@ -63,7 +63,7 @@ int IMG_isXPM(SDL_RWops *src) start = SDL_RWtell(src); is_XPM = 0; if ( SDL_RWread(src, magic, sizeof(magic), 1) ) { - if ( memcmp(magic, "/* XPM */", sizeof(magic)) == 0 ) { + if ( SDL_memcmp(magic, "/* XPM */", sizeof(magic)) == 0 ) { is_XPM = 1; } } @@ -106,7 +106,7 @@ static struct color_hash *create_colorhash(int maxnum) /* we know how many entries we need, so we can allocate everything here */ - hash = malloc(sizeof *hash); + hash = (struct color_hash *)SDL_malloc(sizeof *hash); if(!hash) return NULL; @@ -117,13 +117,13 @@ static struct color_hash *create_colorhash(int maxnum) hash->maxnum = maxnum; bytes = hash->size * sizeof(struct hash_entry **); hash->entries = NULL; /* in case malloc fails */ - hash->table = malloc(bytes); + hash->table = (struct hash_entry **)SDL_malloc(bytes); if(!hash->table) return NULL; memset(hash->table, 0, bytes); - hash->entries = malloc(maxnum * sizeof(struct hash_entry)); + hash->entries = (struct hash_entry *)SDL_malloc(maxnum * sizeof(struct hash_entry)); if(!hash->entries) { - free(hash->table); + SDL_free(hash->table); return NULL; } hash->next_free = hash->entries; @@ -149,7 +149,7 @@ static Uint32 get_colorhash(struct color_hash *hash, const char *key, int cpp) { struct hash_entry *entry = hash->table[hash_key(key, cpp, hash->size)]; while(entry) { - if(memcmp(key, entry->key, cpp) == 0) + if(SDL_memcmp(key, entry->key, cpp) == 0) return entry->color; entry = entry->next; } @@ -158,10 +158,12 @@ static Uint32 get_colorhash(struct color_hash *hash, const char *key, int cpp) static void free_colorhash(struct color_hash *hash) { - if(hash && hash->table) { - free(hash->table); - free(hash->entries); - free(hash); + if(hash) { + if(hash->table) + SDL_free(hash->table); + if(hash->entries) + SDL_free(hash->entries); + SDL_free(hash); } } @@ -871,7 +873,7 @@ static int color_to_rgb(char *spec, int speclen, Uint32 *rgb) buf[4] = buf[5] = spec[3]; break; case 7: - memcpy(buf, spec + 1, 6); + SDL_memcpy(buf, spec + 1, 6); break; case 13: buf[0] = spec[1]; @@ -928,9 +930,9 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len) len += 4; /* "\",\n\0" */ if(len > buflen){ buflen = len; - linebufnew = realloc(linebuf, buflen); + linebufnew = (char *)SDL_realloc(linebuf, buflen); if(!linebufnew) { - free(linebuf); + SDL_free(linebuf); error = "Out of memory"; return NULL; } @@ -948,9 +950,9 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len) if(buflen == 0) buflen = 16; buflen *= 2; - linebufnew = realloc(linebuf, buflen); + linebufnew = (char *)SDL_realloc(linebuf, buflen); if(!linebufnew) { - free(linebuf); + SDL_free(linebuf); error = "Out of memory"; return NULL; } @@ -970,20 +972,20 @@ static char *get_next_line(char ***lines, SDL_RWops *src, int len) #define SKIPSPACE(p) \ do { \ - while(isspace((unsigned char)*(p))) \ + while(SDL_isspace((unsigned char)*(p))) \ ++(p); \ } while(0) #define SKIPNONSPACE(p) \ do { \ - while(!isspace((unsigned char)*(p)) && *p) \ + while(!SDL_isspace((unsigned char)*(p)) && *p) \ ++(p); \ } while(0) /* read XPM from either array or RWops */ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src) { - int start = 0; + Sint64 start = 0; SDL_Surface *image = NULL; int index; int x, y; @@ -1019,13 +1021,13 @@ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src) * Right now we don't use the hotspots but it should be handled * one day. */ - if(sscanf(line, "%d %d %d %d", &w, &h, &ncolors, &cpp) != 4 + if(SDL_sscanf(line, "%d %d %d %d", &w, &h, &ncolors, &cpp) != 4 || w <= 0 || h <= 0 || ncolors <= 0 || cpp <= 0) { error = "Invalid format description"; goto done; } - keystrings = malloc(ncolors * cpp); + keystrings = (char *)SDL_malloc(ncolors * cpp); if(!keystrings) { error = "Out of memory"; goto done; @@ -1085,7 +1087,7 @@ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src) if(!color_to_rgb(colname, p - colname, &rgb)) continue; - memcpy(nextkey, line, cpp); + SDL_memcpy(nextkey, line, cpp); if(indexed) { SDL_Color *c = im_colors + index; c->r = (Uint8)(rgb >> 16); @@ -1104,7 +1106,7 @@ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src) /* Read the pixels */ pixels_len = w * cpp; - dst = image->pixels; + dst = (Uint8 *)image->pixels; for(y = 0; y < h; y++) { line = get_next_line(xpmlines, src, pixels_len); if(indexed) { @@ -1137,9 +1139,11 @@ static SDL_Surface *load_xpm(char **xpm, SDL_RWops *src) } IMG_SetError(error); } - free(keystrings); + if (keystrings) + SDL_free(keystrings); free_colorhash(colors); - free(linebuf); + if (linebuf) + SDL_free(linebuf); return(image); } diff --git a/IMG_xv.c b/IMG_xv.c index 0383ec9f..51d3d26b 100644 --- a/IMG_xv.c +++ b/IMG_xv.c @@ -57,19 +57,19 @@ static int get_header(SDL_RWops *src, int *w, int *h) /* Check the header magic */ if ( (get_line(src, line, sizeof(line)) < 0) || - (memcmp(line, "P7 332", 6) != 0) ) { + (SDL_memcmp(line, "P7 332", 6) != 0) ) { return -1; } /* Read the header */ while ( get_line(src, line, sizeof(line)) == 0 ) { - if ( memcmp(line, "#BUILTIN:", 9) == 0 ) { + if ( SDL_memcmp(line, "#BUILTIN:", 9) == 0 ) { /* Builtin image, no data */ break; } - if ( memcmp(line, "#END_OF_COMMENTS", 16) == 0 ) { + if ( SDL_memcmp(line, "#END_OF_COMMENTS", 16) == 0 ) { if ( get_line(src, line, sizeof(line)) == 0 ) { - sscanf(line, "%d %d", w, h); + SDL_sscanf(line, "%d %d", w, h); if ( *w >= 0 && *h >= 0 ) { return 0; } @@ -84,7 +84,7 @@ static int get_header(SDL_RWops *src, int *w, int *h) /* See if an image is contained in a data source */ int IMG_isXV(SDL_RWops *src) { - int start; + Sint64 start; int is_XV; int w, h; @@ -102,7 +102,7 @@ int IMG_isXV(SDL_RWops *src) /* Load a XV thumbnail image from an SDL datasource */ SDL_Surface *IMG_LoadXV_RW(SDL_RWops *src) { - int start; + Sint64 start; const char *error = NULL; SDL_Surface *surface = NULL; int w, h; diff --git a/VisualC/SDL_image_VS2010.sln b/VisualC/SDL_image_VS2010.sln new file mode 100644 index 00000000..081b7932 --- /dev/null +++ b/VisualC/SDL_image_VS2010.sln @@ -0,0 +1,36 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL_image_VS2010.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage_VS2010.vcxproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.ActiveCfg = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.Build.0 = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.ActiveCfg = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.Build.0 = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.ActiveCfg = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.Build.0 = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|x64.ActiveCfg = Debug|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|x64.Build.0 = Debug|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.ActiveCfg = Release|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.Build.0 = Release|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|x64.ActiveCfg = Release|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualC/SDL_image_VS2010.vcxproj b/VisualC/SDL_image_VS2010.vcxproj new file mode 100644 index 00000000..09728db6 --- /dev/null +++ b/VisualC/SDL_image_VS2010.vcxproj @@ -0,0 +1,398 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SDL2_image + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696} + SDL2_image + + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + DynamicLibrary + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL_image.tlb + + + + + Disabled + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + .\Debug/SDL_image.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/SDL_image.pdb + Windows + MachineX86 + + + true + .\Debug/SDL_image.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL_image.tlb + + + + + Disabled + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + .\Debug/SDL_image.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/SDL_image.pdb + Windows + MachineX64 + + + true + .\Debug/SDL_image.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL_image.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/SDL_image.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/SDL_image.pdb + Windows + MachineX86 + + + true + .\Release/SDL_image.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL_image.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/SDL_image.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/SDL_image.pdb + Windows + MachineX64 + + + true + .\Release/SDL_image.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/SDL_image_VS2012.sln b/VisualC/SDL_image_VS2012.sln new file mode 100644 index 00000000..e3c52fcb --- /dev/null +++ b/VisualC/SDL_image_VS2012.sln @@ -0,0 +1,36 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2_image", "SDL_image_VS2012.vcxproj", "{2BD5534E-00E2-4BEA-AC96-D9A92EA24696}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "showimage", "showimage\showimage_VS2012.vcxproj", "{FEE80C5D-762E-4E57-9BCB-928749E8203F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.ActiveCfg = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|Win32.Build.0 = Debug|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.ActiveCfg = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Debug|x64.Build.0 = Debug|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.ActiveCfg = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|Win32.Build.0 = Release|Win32 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.ActiveCfg = Release|x64 + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696}.Release|x64.Build.0 = Release|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.ActiveCfg = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|Win32.Build.0 = Debug|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|x64.ActiveCfg = Debug|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Debug|x64.Build.0 = Debug|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.ActiveCfg = Release|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|Win32.Build.0 = Release|Win32 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|x64.ActiveCfg = Release|x64 + {FEE80C5D-762E-4E57-9BCB-928749E8203F}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/VisualC/SDL_image_VS2012.vcxproj b/VisualC/SDL_image_VS2012.vcxproj new file mode 100644 index 00000000..c90a7352 --- /dev/null +++ b/VisualC/SDL_image_VS2012.vcxproj @@ -0,0 +1,402 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + SDL2_image + {2BD5534E-00E2-4BEA-AC96-D9A92EA24696} + SDL2_image + + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + DynamicLibrary + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/SDL_image.tlb + + + + + Disabled + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + .\Debug/SDL_image.pch + Level3 + true + EditAndContinue + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/SDL_image.pdb + Windows + MachineX86 + + + true + .\Debug/SDL_image.bsc + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/SDL_image.tlb + + + + + Disabled + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + _DEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + .\Debug/SDL_image.pch + Level3 + true + ProgramDatabase + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/SDL_image.pdb + Windows + MachineX64 + + + true + .\Debug/SDL_image.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/SDL_image.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/SDL_image.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/SDL_image.pdb + Windows + MachineX86 + + + true + .\Release/SDL_image.bsc + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/SDL_image.tlb + + + + + MaxSpeed + OnlyExplicitInline + ..\..\SDL\include;external\include;%(AdditionalIncludeDirectories) + NDEBUG;WIN32;_WINDOWS;LOAD_BMP;LOAD_GIF;LOAD_JPG;LOAD_JPG_DYNAMIC="libjpeg-8.dll";LOAD_LBM;LOAD_PCX;LOAD_PNG;LOAD_PNG_DYNAMIC="libpng15-15.dll";LOAD_PNM;LOAD_TGA;LOAD_TIF;LOAD_TIF_DYNAMIC="libtiff-5.dll";LOAD_WEBP;LOAD_WEBP_DYNAMIC="libwebp-2.dll";LOAD_XPM;LOAD_XV;PNG_USE_DLL;ZLIB_DLL;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/SDL_image.pch + Level3 + true + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/SDL_image.pdb + Windows + MachineX64 + + + true + .\Release/SDL_image.bsc + + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + %(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/showimage/showimage_VS2010.vcxproj b/VisualC/showimage/showimage_VS2010.vcxproj new file mode 100644 index 00000000..52dc4252 --- /dev/null +++ b/VisualC/showimage/showimage_VS2010.vcxproj @@ -0,0 +1,285 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + showimage + {FEE80C5D-762E-4E57-9BCB-928749E8203F} + + + + Application + false + + + Application + false + + + Application + false + + + Application + false + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + .\Debug/showimage.pch + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/showimage.pdb + Windows + MachineX86 + + + true + .\Debug/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + .\Debug/showimage.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/showimage.pdb + Windows + MachineX64 + + + true + .\Debug/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/showimage.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/showimage.pdb + Windows + MachineX86 + + + true + .\Release/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/showimage.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/showimage.pdb + Windows + MachineX64 + + + true + .\Release/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {2bd5534e-00e2-4bea-ac96-d9a92ea24696} + false + + + + + + + + + + \ No newline at end of file diff --git a/VisualC/showimage/showimage_VS2012.vcxproj b/VisualC/showimage/showimage_VS2012.vcxproj new file mode 100644 index 00000000..49f9ab24 --- /dev/null +++ b/VisualC/showimage/showimage_VS2012.vcxproj @@ -0,0 +1,289 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + showimage + {FEE80C5D-762E-4E57-9BCB-928749E8203F} + + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + Application + false + v110 + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.40219.1 + .\Debug\ + .\Debug\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + .\Release\ + .\Release\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + AllRules.ruleset + + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Debug/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + .\Debug/showimage.pch + Level3 + true + EditAndContinue + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/showimage.pdb + Windows + MachineX86 + + + true + .\Debug/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + _DEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Debug/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + Disabled + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDebugDLL + .\Debug/showimage.pch + Level3 + true + ProgramDatabase + Default + + + _DEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + true + .\Debug/showimage.pdb + Windows + MachineX64 + + + true + .\Debug/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + Win32 + .\Release/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/showimage.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/showimage.pdb + Windows + MachineX86 + + + true + .\Release/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + NDEBUG;%(PreprocessorDefinitions) + true + true + X64 + .\Release/showimage.tlb + + + + + ..\..\..\SDL\include;%(AdditionalIncludeDirectories) + MaxSpeed + OnlyExplicitInline + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + true + .\Release/showimage.pch + Level3 + true + Default + + + NDEBUG;%(PreprocessorDefinitions) + 0x0409 + + + %(AdditionalDependencies) + .\Release/showimage.pdb + Windows + MachineX64 + + + true + .\Release/showimage.bsc + + + copy /Y "..\..\..\SDL\VisualC\SDL\$(Platform)\$(Configuration)\SDL.dll" "$(TargetDir)\SDL.dll" +copy /Y "..\$(Configuration)\SDL2_image.dll" "$(TargetDir)\SDL2_image.dll" + + Copy SDL and data files + + + + + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + %(PreprocessorDefinitions) + + + + + {2bd5534e-00e2-4bea-ac96-d9a92ea24696} + false + + + + + + + + + + \ No newline at end of file