X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=contrib%2Fvisupng%2FPngFile.c;h=dcde18a3af4c8acac8be58dd6a03b804a06f48a8;hb=361fb099aa967c1618d8071268abab395e67e86a;hp=ff6d155e515361d9ebc8255f839718af232ce749;hpb=5ab0f6df7ecb95c9b816ece7a88a8df92b0cb2af;p=platform%2Fupstream%2Flibpng.git diff --git a/contrib/visupng/PngFile.c b/contrib/visupng/PngFile.c index ff6d155..dcde18a 100644 --- a/contrib/visupng/PngFile.c +++ b/contrib/visupng/PngFile.c @@ -1,17 +1,19 @@ -//------------------------------------- -// PNGFILE.C -- Image File Functions -//------------------------------------- - -// Copyright 2000, Willem van Schaik. -// -// This code is released under the libpng license. -// For conditions of distribution and use, see the disclaimer -// and license in png.h +/*------------------------------------- + * PNGFILE.C -- Image File Functions + *------------------------------------- + * + * Copyright 2000, Willem van Schaik. + * + * This code is released under the libpng license. + * For conditions of distribution and use, see the disclaimer + * and license in png.h + */ #include #include #include #include +#include #include "png.h" #include "pngfile.h" @@ -28,14 +30,14 @@ static png_structp png_ptr = NULL; static png_infop info_ptr = NULL; -// cexcept interface +/* cexcept interface */ static void png_cexcept_error(png_structp png_ptr, png_const_charp msg) { if(png_ptr) ; -#ifndef PNG_NO_CONSOLE_IO +#ifdef PNG_CONSOLE_IO_SUPPORTED fprintf(stderr, "libpng error: %s\n", msg); #endif { @@ -43,7 +45,7 @@ png_cexcept_error(png_structp png_ptr, png_const_charp msg) } } -// Windows open-file functions +/* Windows open-file functions */ void PngFileInitialize (HWND hwnd) { @@ -57,13 +59,13 @@ void PngFileInitialize (HWND hwnd) ofn.lpstrCustomFilter = NULL; ofn.nMaxCustFilter = 0; ofn.nFilterIndex = 0; - ofn.lpstrFile = NULL; // Set in Open and Close functions + ofn.lpstrFile = NULL; /* Set in Open and Close functions */ ofn.nMaxFile = MAX_PATH; - ofn.lpstrFileTitle = NULL; // Set in Open and Close functions + ofn.lpstrFileTitle = NULL; /* Set in Open and Close functions */ ofn.nMaxFileTitle = MAX_PATH; ofn.lpstrInitialDir = NULL; ofn.lpstrTitle = NULL; - ofn.Flags = 0; // Set in Open and Close functions + ofn.Flags = 0; /* Set in Open and Close functions */ ofn.nFileOffset = 0; ofn.nFileExtension = 0; ofn.lpstrDefExt = TEXT ("png"); @@ -92,7 +94,7 @@ BOOL PngFileSaveDlg (HWND hwnd, PTSTR pstrFileName, PTSTR pstrTitleName) return GetSaveFileName (&ofn); } -// PNG image handler functions +/* PNG image handler functions */ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, int *piWidth, int *piHeight, int *piChannels, png_color *pBkgColor) @@ -109,7 +111,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, static png_byte **ppbRowPointers = NULL; int i; - // open the PNG input file + /* open the PNG input file */ if (!pstrFileName) { @@ -123,7 +125,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, return FALSE; } - // first check the eight byte PNG signature + /* first check the eight byte PNG signature */ fread(pbSig, 1, 8, pfFile); if (png_sig_cmp(pbSig, 0, 8)) @@ -132,7 +134,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, return FALSE; } - // create the two png(-info) structures + /* create the two png(-info) structures */ png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL); @@ -152,31 +154,37 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, Try { - - // initialize the png structure - -#if !defined(PNG_NO_STDIO) + + /* initialize the png structure */ + +#ifdef PNG_STDIO_SUPPORTED png_init_io(png_ptr, pfFile); #else png_set_read_fn(png_ptr, (png_voidp)pfFile, png_read_data); #endif - + png_set_sig_bytes(png_ptr, 8); - - // read all PNG info up to image data - + + /* read all PNG info up to image data */ + png_read_info(png_ptr, info_ptr); - - // get width, height, bit-depth and color-type - + + /* get width, height, bit-depth and color-type */ + png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, &iColorType, NULL, NULL, NULL); - - // expand images of all color-type and bit-depth to 3x8 bit RGB images - // let the library process things like alpha, transparency, background - - if (iBitDepth == 16) - png_set_strip_16(png_ptr); + + /* expand images of all color-type and bit-depth to 3x8-bit RGB */ + /* let the library process alpha, transparency, background, etc. */ + +#ifdef PNG_READ_16_TO_8_SUPPORTED + if (iBitDepth == 16) +# ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED + png_set_scale_16(png_ptr); +# else + png_set_strip_16(png_ptr); +# endif +#endif if (iColorType == PNG_COLOR_TYPE_PALETTE) png_set_expand(png_ptr); if (iBitDepth < 8) @@ -186,8 +194,8 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, if (iColorType == PNG_COLOR_TYPE_GRAY || iColorType == PNG_COLOR_TYPE_GRAY_ALPHA) png_set_gray_to_rgb(png_ptr); - - // set the background color to draw transparent and alpha images over. + + /* set the background color to draw transparent and alpha images over */ if (png_get_bKGD(png_ptr, info_ptr, &pBackground)) { png_set_background(png_ptr, pBackground, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); @@ -199,30 +207,30 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, { pBkgColor = NULL; } - - // if required set gamma conversion + + /* if required set gamma conversion */ if (png_get_gAMA(png_ptr, info_ptr, &dGamma)) png_set_gamma(png_ptr, (double) 2.2, dGamma); - - // after the transformations have been registered update info_ptr data - + + /* after the transformations are registered, update info_ptr data */ + png_read_update_info(png_ptr, info_ptr); - - // get again width, height and the new bit-depth and color-type - + + /* get again width, height and the new bit-depth and color-type */ + png_get_IHDR(png_ptr, info_ptr, piWidth, piHeight, &iBitDepth, &iColorType, NULL, NULL, NULL); - - - // row_bytes is the width x number of channels - + + + /* row_bytes is the width x number of channels */ + ulRowBytes = png_get_rowbytes(png_ptr, info_ptr); ulChannels = png_get_channels(png_ptr, info_ptr); - + *piChannels = ulChannels; - - // now we can allocate memory to store the image - + + /* now we can allocate memory to store the image */ + if (pbImageData) { free (pbImageData); @@ -234,34 +242,34 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, png_error(png_ptr, "Visual PNG: out of memory"); } *ppbImageData = pbImageData; - - // and allocate memory for an array of row-pointers - + + /* and allocate memory for an array of row-pointers */ + if ((ppbRowPointers = (png_bytepp) malloc((*piHeight) * sizeof(png_bytep))) == NULL) { png_error(png_ptr, "Visual PNG: out of memory"); } - - // set the individual row-pointers to point at the correct offsets - + + /* set the individual row-pointers to point at the correct offsets */ + for (i = 0; i < (*piHeight); i++) ppbRowPointers[i] = pbImageData + i * ulRowBytes; - - // now we can go ahead and just read the whole image - + + /* now we can go ahead and just read the whole image */ + png_read_image(png_ptr, ppbRowPointers); - - // read the additional chunks in the PNG file (not really needed) - + + /* read the additional chunks in the PNG file (not really needed) */ + png_read_end(png_ptr, NULL); - - // and we're done - + + /* and we're done */ + free (ppbRowPointers); ppbRowPointers = NULL; - - // yepp, done + + /* yepp, done */ } Catch (msg) @@ -269,7 +277,7 @@ BOOL PngLoadImage (PTSTR pstrFileName, png_byte **ppbImageData, png_destroy_read_struct(&png_ptr, &info_ptr, NULL); *ppbImageData = pbImageData = NULL; - + if(ppbRowPointers) free (ppbRowPointers); @@ -295,7 +303,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, static png_byte **ppbRowPointers = NULL; int i; - // open the PNG output file + /* open the PNG output file */ if (!pstrFileName) return FALSE; @@ -303,7 +311,7 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, if (!(pfFile = fopen(pstrFileName, "wb"))) return FALSE; - // prepare the standard PNG structures + /* prepare the standard PNG structures */ png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, NULL, (png_error_ptr)png_cexcept_error, (png_error_ptr)NULL); @@ -322,60 +330,60 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, Try { - // initialize the png structure - -#if !defined(PNG_NO_STDIO) + /* initialize the png structure */ + +#ifdef PNG_STDIO_SUPPORTED png_init_io(png_ptr, pfFile); #else png_set_write_fn(png_ptr, (png_voidp)pfFile, png_write_data, png_flush); #endif - - // we're going to write a very simple 3x8 bit RGB image - + + /* we're going to write a very simple 3x8-bit RGB image */ + png_set_IHDR(png_ptr, info_ptr, iWidth, iHeight, ciBitDepth, PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - // write the file header information - + + /* write the file header information */ + png_write_info(png_ptr, info_ptr); - - // swap the BGR pixels in the DiData structure to RGB - + + /* swap the BGR pixels in the DiData structure to RGB */ + png_set_bgr(png_ptr); - - // row_bytes is the width x number of channels - + + /* row_bytes is the width x number of channels */ + ulRowBytes = iWidth * ciChannels; - - // we can allocate memory for an array of row-pointers - + + /* we can allocate memory for an array of row-pointers */ + if ((ppbRowPointers = (png_bytepp) malloc(iHeight * sizeof(png_bytep))) == NULL) Throw "Visualpng: Out of memory"; - - // set the individual row-pointers to point at the correct offsets - + + /* set the individual row-pointers to point at the correct offsets */ + for (i = 0; i < iHeight; i++) ppbRowPointers[i] = pDiData + i * (((ulRowBytes + 3) >> 2) << 2); - - // write out the entire image data in one call - + + /* write out the entire image data in one call */ + png_write_image (png_ptr, ppbRowPointers); - - // write the additional chunks to the PNG file (not really needed) - + + /* write the additional chunks to the PNG file (not really needed) */ + png_write_end(png_ptr, info_ptr); - - // and we're done - + + /* and we're done */ + free (ppbRowPointers); ppbRowPointers = NULL; - - // clean up after the write, and free any memory allocated - + + /* clean up after the write, and free any memory allocated */ + png_destroy_write_struct(&png_ptr, (png_infopp) NULL); - - // yepp, done + + /* yepp, done */ } Catch (msg) @@ -389,13 +397,13 @@ BOOL PngSaveImage (PTSTR pstrFileName, png_byte *pDiData, return FALSE; } - + fclose (pfFile); - + return TRUE; } -#ifdef PNG_NO_STDIO +#ifndef PNG_STDIO_SUPPORTED static void png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) @@ -437,6 +445,7 @@ png_flush(png_structp png_ptr) #endif -//----------------- -// end of source -//----------------- +/*----------------- + * end of source + *----------------- + */