From bb3362fd124988b5730b8ff7d1a9c0e6b6c67789 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 18 Jun 2016 20:27:58 +0200 Subject: [PATCH] Drop useless 3rd party files from nedmalloc and png Part of #5272 --- drivers/nedmalloc/Benchmarks.xls | Bin 36352 -> 0 bytes drivers/nedmalloc/SCsub | 1 - drivers/nedmalloc/nedmalloc.sln | 19 - drivers/nedmalloc/nedmalloc.vcproj | 259 --------- drivers/nedmalloc/test.c | 356 ------------ drivers/png/SCsub | 1 - drivers/png/example.c | 879 ----------------------------- 7 files changed, 1515 deletions(-) delete mode 100644 drivers/nedmalloc/Benchmarks.xls delete mode 100644 drivers/nedmalloc/nedmalloc.sln delete mode 100644 drivers/nedmalloc/nedmalloc.vcproj delete mode 100644 drivers/nedmalloc/test.c delete mode 100644 drivers/png/example.c diff --git a/drivers/nedmalloc/Benchmarks.xls b/drivers/nedmalloc/Benchmarks.xls deleted file mode 100644 index 5001a18a226e996b622ee5149871398c5204691a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 36352 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 diff --git a/drivers/nedmalloc/SCsub b/drivers/nedmalloc/SCsub index 8e6edd1f964..6699efef756 100644 --- a/drivers/nedmalloc/SCsub +++ b/drivers/nedmalloc/SCsub @@ -2,4 +2,3 @@ Import('env') Export('env'); env.add_source_files(env.drivers_sources,"*.cpp") -#env.add_source_files(env.drivers_sources,"*.c") diff --git a/drivers/nedmalloc/nedmalloc.sln b/drivers/nedmalloc/nedmalloc.sln deleted file mode 100644 index 6ffd9fb83fc..00000000000 --- a/drivers/nedmalloc/nedmalloc.sln +++ /dev/null @@ -1,19 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "nedmalloc", "nedmalloc.vcproj", "{B89384F5-360B-4AB2-8F43-2F5F98A947FE}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Debug|Win32.Build.0 = Debug|Win32 - {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Release|Win32.ActiveCfg = Release|Win32 - {B89384F5-360B-4AB2-8F43-2F5F98A947FE}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/drivers/nedmalloc/nedmalloc.vcproj b/drivers/nedmalloc/nedmalloc.vcproj deleted file mode 100644 index c5b0563d4f4..00000000000 --- a/drivers/nedmalloc/nedmalloc.vcproj +++ /dev/null @@ -1,259 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/drivers/nedmalloc/test.c b/drivers/nedmalloc/test.c deleted file mode 100644 index 8b9fed81d0f..00000000000 --- a/drivers/nedmalloc/test.c +++ /dev/null @@ -1,356 +0,0 @@ -/* test.c -An example of how to use nedalloc -(C) 2005-2007 Niall Douglas -*/ - -#include -#include -#include "nedmalloc.c" - -#define THREADS 5 -#define RECORDS (100000/THREADS) -#define TORTURETEST 1 - -static int whichmalloc; -static int doRealloc; -static struct threadstuff_t -{ - int ops; - unsigned int *toalloc; - void **allocs; - char cachesync1[128]; - int done; - char cachesync2[128]; -} threadstuff[THREADS]; - -static void threadcode(int); - -#ifdef WIN32 -static DWORD WINAPI _threadcode(LPVOID a) -{ - threadcode((int)(size_t) a); - return 0; -} -#define THREADVAR HANDLE -#define THREADINIT(v, id) (*v=CreateThread(NULL, 0, _threadcode, (LPVOID)(size_t) id, 0, NULL)) -#define THREADSLEEP(v) SleepEx(v, FALSE) -#define THREADWAIT(v) (WaitForSingleObject(v, INFINITE), 0) - -typedef unsigned __int64 usCount; -static FORCEINLINE usCount GetUsCount() -{ - static LARGE_INTEGER ticksPerSec; - static double scalefactor; - LARGE_INTEGER val; - if(!scalefactor) - { - if(QueryPerformanceFrequency(&ticksPerSec)) - scalefactor=ticksPerSec.QuadPart/1000000000000.0; - else - scalefactor=1; - } - if(!QueryPerformanceCounter(&val)) - return (usCount) GetTickCount() * 1000000000; - return (usCount) (val.QuadPart/scalefactor); -} - -static HANDLE win32heap; -static void *win32malloc(size_t size) -{ - return HeapAlloc(win32heap, 0, size); -} -static void *win32realloc(void *p, size_t size) -{ - return HeapReAlloc(win32heap, 0, p, size); -} -static void win32free(void *mem) -{ - HeapFree(win32heap, 0, mem); -} - -static void *(*const mallocs[])(size_t size)={ malloc, nedmalloc, win32malloc }; -static void *(*const reallocs[])(void *p, size_t size)={ realloc, nedrealloc, win32realloc }; -static void (*const frees[])(void *mem)={ free, nedfree, win32free }; -#else -static void *_threadcode(void *a) -{ - threadcode((int)(size_t) a); - return 0; -} -#define THREADVAR pthread_t -#define THREADINIT(v, id) pthread_create(v, NULL, _threadcode, (void *)(size_t) id) -#define THREADSLEEP(v) usleep(v*1000) -#define THREADWAIT(v) pthread_join(v, NULL) - -typedef unsigned long long usCount; -static FORCEINLINE usCount GetUsCount() -{ - struct timeval tv; - gettimeofday(&tv, 0); - return ((usCount) tv.tv_sec*1000000000000LL)+tv.tv_usec*1000000LL; -} - -static void *(*const mallocs[])(size_t size)={ malloc, nedmalloc }; -static void *(*const reallocs[])(void *p, size_t size)={ realloc, nedrealloc }; -static void (*const frees[])(void *mem)={ free, nedfree }; -#endif -static usCount times[THREADS]; - - -static FORCEINLINE unsigned int myrandom(unsigned int *seed) -{ - *seed=1664525UL*(*seed)+1013904223UL; - return *seed; -} - -static void threadcode(int threadidx) -{ - int n; - unsigned int *toallocptr=threadstuff[threadidx].toalloc; - void **allocptr=threadstuff[threadidx].allocs; - unsigned int seed=threadidx; - usCount start; - threadstuff[threadidx].done=0; - /*neddisablethreadcache(0);*/ - THREADSLEEP(100); - start=GetUsCount(); -#ifdef TORTURETEST - /* A randomised malloc/realloc/free test (torture test) */ - for(n=0; nthreadstuff[threadidx].allocs && (r & 65535)<32760) /*<32760)*/ - { /* free */ - --toallocptr; - --allocptr; - --n; - frees[whichmalloc](*allocptr); - *allocptr=0; - } - else -#endif - { - if(doRealloc && allocptr>threadstuff[threadidx].allocs && (r & 1)) - { - allocptr[-1]=reallocs[whichmalloc](allocptr[-1], *toallocptr); - } - else - { - allocptr[0]=mallocs[whichmalloc](*toallocptr); - allocptr++; - } - n++; - toallocptr++; - threadstuff[threadidx].ops++; - } - } - while(allocptr>threadstuff[threadidx].allocs) - { - frees[whichmalloc](*--allocptr); - } -#endif - times[threadidx]+=GetUsCount()-start; - neddisablethreadcache(0); - threadstuff[threadidx].done=1; -} - -static double runtest() -{ - unsigned int seed=1; - int n, i; - double opspersec=0; - THREADVAR threads[THREADS]; - for(n=0; n=0; n--) - { - THREADWAIT(threads[n]); - threads[n]=0; - } -#else -#if 1 - for(n=0; n=0; n--) - { - THREADWAIT(threads[n]); - threads[n]=0; - } -#else - /* Quick realloc() test */ - doRealloc=1; - for(n=0; n=0; n--) - { - THREADWAIT(threads[n]); - threads[n]=0; - } -#endif -#endif - { - usCount totaltime=0; - int totalops=0; - for(n=0; n=0; n--) - { - free(threadstuff[n].allocs); threadstuff[n].allocs=0; - free(threadstuff[n].toalloc); threadstuff[n].toalloc=0; - } - return opspersec; -} - -int main(void) -{ - double std=0, ned=0; - -#if 0 - { - usCount start, end; - start=GetUsCount(); - THREADSLEEP(5000); - end=GetUsCount(); - printf("Wait was %lf\n", (end-start)/1000000000000.0); - } -#endif -#ifdef WIN32 - { /* Force load of user32.dll so we can debug */ - BOOL v; - SystemParametersInfo(SPI_GETBEEP, 0, &v, 0); - } -#endif - - if(0) - { - printf("\nTesting standard allocator with %d threads ...\n", THREADS); - std=runtest(); - } - if(1) - { - printf("\nTesting nedmalloc with %d threads ...\n", THREADS); - whichmalloc=1; - ned=runtest(); - } -#ifdef WIN32 - if(0) - { - ULONG data=2; - win32heap=HeapCreate(0, 0, 0); - HeapSetInformation(win32heap, HeapCompatibilityInformation, &data, sizeof(data)); - HeapQueryInformation(win32heap, HeapCompatibilityInformation, &data, sizeof(data), NULL); - if(2!=data) - { - printf("The win32 low frag allocator won't work under a debugger!\n"); - } - else - { - printf("Testing win32 low frag allocator with %d threads ...\n\n", THREADS); - whichmalloc=2; - runtest(); - } - HeapDestroy(win32heap); - } -#endif - if(std && ned) - { // ned should have more ops/sec - printf("\n\nnedmalloc allocator is %lf times faster than standard\n", ned/std); - } - printf("\nPress a key to trim\n"); - getchar(); - nedmalloc_trim(0); -#ifdef _MSC_VER - printf("\nPress a key to end\n"); - getchar(); -#endif - return 0; -} diff --git a/drivers/png/SCsub b/drivers/png/SCsub index 9dbffeed1f5..96ef9fa5f87 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -3,7 +3,6 @@ Import('env_drivers') png_sources = [ - "png/example.c", "png/png.c", "png/pngerror.c", "png/pngget.c", diff --git a/drivers/png/example.c b/drivers/png/example.c deleted file mode 100644 index 7171d9847e2..00000000000 --- a/drivers/png/example.c +++ /dev/null @@ -1,879 +0,0 @@ - -#if 0 /* in case someone actually tries to compile this */ - -/* example.c - an example of using libpng - * Last changed in libpng 1.5.19 [August 21, 2014] - * Maintained 1998-2014 Glenn Randers-Pehrson - * Maintained 1996, 1997 Andreas Dilger - * Written 1995, 1996 Guy Eric Schalnat, Group 42, Inc. - */ - -/* This is an example of how to use libpng to read and write PNG files. - * The file libpng-manual.txt is much more verbose then this. If you have not - * read it, do so first. This was designed to be a starting point of an - * implementation. This is not officially part of libpng, is hereby placed - * in the public domain, and therefore does not require a copyright notice. - * To the extent possible under law, the authors have waived all copyright and - * related or neighboring rights to this file. - * - * This file does not currently compile, because it is missing certain - * parts, like allocating memory to hold an image. You will have to - * supply these parts to get it to compile. For an example of a minimal - * working PNG reader/writer, see pngtest.c, included in this distribution; - * see also the programs in the contrib directory. - */ - -#define _POSIX_SOURCE 1 /* libpng and zlib are POSIX-compliant. You may - * change this if your application uses non-POSIX - * extensions. */ - -#include "png.h" - - /* The png_jmpbuf() macro, used in error handling, became available in - * libpng version 1.0.6. If you want to be able to run your code with older - * versions of libpng, you must define the macro yourself (but only if it - * is not already defined by libpng!). - */ - -#ifndef png_jmpbuf -# define png_jmpbuf(png_ptr) ((png_ptr)->png_jmpbuf) -#endif - -/* Check to see if a file is a PNG file using png_sig_cmp(). png_sig_cmp() - * returns zero if the image is a PNG and nonzero if it isn't a PNG. - * - * The function check_if_png() shown here, but not used, returns nonzero (true) - * if the file can be opened and is a PNG, 0 (false) otherwise. - * - * If this call is successful, and you are going to keep the file open, - * you should call png_set_sig_bytes(png_ptr, PNG_BYTES_TO_CHECK); once - * you have created the png_ptr, so that libpng knows your application - * has read that many bytes from the start of the file. Make sure you - * don't call png_set_sig_bytes() with more than 8 bytes read or give it - * an incorrect number of bytes read, or you will either have read too - * many bytes (your fault), or you are telling libpng to read the wrong - * number of magic bytes (also your fault). - * - * Many applications already read the first 2 or 4 bytes from the start - * of the image to determine the file type, so it would be easiest just - * to pass the bytes to png_sig_cmp() or even skip that if you know - * you have a PNG file, and call png_set_sig_bytes(). - */ -#define PNG_BYTES_TO_CHECK 4 -int check_if_png(char *file_name, FILE **fp) -{ - char buf[PNG_BYTES_TO_CHECK]; - - /* Open the prospective PNG file. */ - if ((*fp = fopen(file_name, "rb")) == NULL) - return 0; - - /* Read in some of the signature bytes */ - if (fread(buf, 1, PNG_BYTES_TO_CHECK, *fp) != PNG_BYTES_TO_CHECK) - return 0; - - /* Compare the first PNG_BYTES_TO_CHECK bytes of the signature. - Return nonzero (true) if they match */ - - return(!png_sig_cmp(buf, (png_size_t)0, PNG_BYTES_TO_CHECK)); -} - -/* Read a PNG file. You may want to return an error code if the read - * fails (depending upon the failure). There are two "prototypes" given - * here - one where we are given the filename, and we need to open the - * file, and the other where we are given an open file (possibly with - * some or all of the magic bytes read - see comments above). - */ -#ifdef open_file /* prototype 1 */ -void read_png(char *file_name) /* We need to open the file */ -{ - png_structp png_ptr; - png_infop info_ptr; - int sig_read = 0; - png_uint_32 width, height; - int bit_depth, color_type, interlace_type; - FILE *fp; - - if ((fp = fopen(file_name, "rb")) == NULL) - return (ERROR); - -#else no_open_file /* prototype 2 */ -void read_png(FILE *fp, int sig_read) /* File is already open */ -{ - png_structp png_ptr; - png_infop info_ptr; - png_uint_32 width, height; - int bit_depth, color_type, interlace_type; -#endif no_open_file /* Only use one prototype! */ - - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also supply the - * the compiler header file version, so that we know if the application - * was compiled with a compatible version of the library. REQUIRED - */ - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (png_ptr == NULL) - { - fclose(fp); - return (ERROR); - } - - /* Allocate/initialize the memory for image information. REQUIRED. */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - fclose(fp); - png_destroy_read_struct(&png_ptr, NULL, NULL); - return (ERROR); - } - - /* Set error handling if you are using the setjmp/longjmp method (this is - * the normal method of doing things with libpng). REQUIRED unless you - * set up your own error handlers in the png_create_read_struct() earlier. - */ - - if (setjmp(png_jmpbuf(png_ptr))) - { - /* Free all of the memory associated with the png_ptr and info_ptr */ - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - fclose(fp); - /* If we get here, we had a problem reading the file */ - return (ERROR); - } - - /* One of the following I/O initialization methods is REQUIRED */ -#ifdef streams /* PNG file I/O method 1 */ - /* Set up the input control if you are using standard C streams */ - png_init_io(png_ptr, fp); - -#else no_streams /* PNG file I/O method 2 */ - /* If you are using replacement read functions, instead of calling - * png_init_io() here you would call: - */ - png_set_read_fn(png_ptr, (void *)user_io_ptr, user_read_fn); - /* where user_io_ptr is a structure you want available to the callbacks */ -#endif no_streams /* Use only one I/O method! */ - - /* If we have already read some of the signature */ - png_set_sig_bytes(png_ptr, sig_read); - -#ifdef hilevel - /* - * If you have enough memory to read in the entire image at once, - * and you need to specify only transforms that can be controlled - * with one of the PNG_TRANSFORM_* bits (this presently excludes - * quantizing, filling, setting background, and doing gamma - * adjustment), then you can read the entire image (including - * pixels) into the info structure with this call: - */ - png_read_png(png_ptr, info_ptr, png_transforms, NULL); - -#else - /* OK, you're doing it the hard way, with the lower-level functions */ - - /* The call to png_read_info() gives us all of the information from the - * PNG file before the first IDAT (image data chunk). REQUIRED - */ - png_read_info(png_ptr, info_ptr); - - png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, - &interlace_type, NULL, NULL); - - /* Set up the data transformations you want. Note that these are all - * optional. Only call them if you want/need them. Many of the - * transformations only work on specific types of images, and many - * are mutually exclusive. - */ - - /* Tell libpng to strip 16 bits/color files down to 8 bits/color. - * Use accurate scaling if it's available, otherwise just chop off the - * low byte. - */ -#ifdef PNG_READ_SCALE_16_TO_8_SUPPORTED - png_set_scale_16(png_ptr); -#else - png_set_strip_16(png_ptr); -#endif - - /* Strip alpha bytes from the input data without combining with the - * background (not recommended). - */ - png_set_strip_alpha(png_ptr); - - /* Extract multiple pixels with bit depths of 1, 2, and 4 from a single - * byte into separate bytes (useful for paletted and grayscale images). - */ - png_set_packing(png_ptr); - - /* Change the order of packed pixels to least significant bit first - * (not useful if you are using png_set_packing). */ - png_set_packswap(png_ptr); - - /* Expand paletted colors into true RGB triplets */ - if (color_type == PNG_COLOR_TYPE_PALETTE) - png_set_palette_to_rgb(png_ptr); - - /* Expand grayscale images to the full 8 bits from 1, 2, or 4 bits/pixel */ - if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) - png_set_expand_gray_1_2_4_to_8(png_ptr); - - /* Expand paletted or RGB images with transparency to full alpha channels - * so the data will be available as RGBA quartets. - */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) - png_set_tRNS_to_alpha(png_ptr); - - /* Set the background color to draw transparent and alpha images over. - * It is possible to set the red, green, and blue components directly - * for paletted images instead of supplying a palette index. Note that - * even if the PNG file supplies a background, you are not required to - * use it - you should use the (solid) application background if it has one. - */ - - png_color_16 my_background, *image_background; - - if (png_get_bKGD(png_ptr, info_ptr, &image_background)) - png_set_background(png_ptr, image_background, - PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); - else - png_set_background(png_ptr, &my_background, - PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); - - /* Some suggestions as to how to get a screen gamma value - * - * Note that screen gamma is the display_exponent, which includes - * the CRT_exponent and any correction for viewing conditions - */ - if (/* We have a user-defined screen gamma value */) - { - screen_gamma = user-defined screen_gamma; - } - /* This is one way that applications share the same screen gamma value */ - else if ((gamma_str = getenv("SCREEN_GAMMA")) != NULL) - { - screen_gamma = atof(gamma_str); - } - /* If we don't have another value */ - else - { - screen_gamma = PNG_DEFAULT_sRGB; /* A good guess for a PC monitor - in a dimly lit room */ - screen_gamma = PNG_GAMMA_MAC_18 or 1.0; /* Good guesses for Mac systems */ - } - - /* Tell libpng to handle the gamma conversion for you. The final call - * is a good guess for PC generated images, but it should be configurable - * by the user at run time by the user. It is strongly suggested that - * your application support gamma correction. - */ - - int intent; - - if (png_get_sRGB(png_ptr, info_ptr, &intent)) - png_set_gamma(png_ptr, screen_gamma, PNG_DEFAULT_sRGB); - else - { - double image_gamma; - if (png_get_gAMA(png_ptr, info_ptr, &image_gamma)) - png_set_gamma(png_ptr, screen_gamma, image_gamma); - else - png_set_gamma(png_ptr, screen_gamma, 0.45455); - } - -#ifdef PNG_READ_QUANTIZE_SUPPORTED - /* Quantize RGB files down to 8-bit palette or reduce palettes - * to the number of colors available on your screen. - */ - if (color_type & PNG_COLOR_MASK_COLOR) - { - int num_palette; - png_colorp palette; - - /* This reduces the image to the application supplied palette */ - if (/* We have our own palette */) - { - /* An array of colors to which the image should be quantized */ - png_color std_color_cube[MAX_SCREEN_COLORS]; - - png_set_quantize(png_ptr, std_color_cube, MAX_SCREEN_COLORS, - MAX_SCREEN_COLORS, NULL, 0); - } - /* This reduces the image to the palette supplied in the file */ - else if (png_get_PLTE(png_ptr, info_ptr, &palette, &num_palette)) - { - png_uint_16p histogram = NULL; - - png_get_hIST(png_ptr, info_ptr, &histogram); - - png_set_quantize(png_ptr, palette, num_palette, - max_screen_colors, histogram, 0); - } - } -#endif /* PNG_READ_QUANTIZE_SUPPORTED */ - - /* Invert monochrome files to have 0 as white and 1 as black */ - png_set_invert_mono(png_ptr); - - /* If you want to shift the pixel values from the range [0,255] or - * [0,65535] to the original [0,7] or [0,31], or whatever range the - * colors were originally in: - */ - if (png_get_valid(png_ptr, info_ptr, PNG_INFO_sBIT)) - { - png_color_8p sig_bit_p; - - png_get_sBIT(png_ptr, info_ptr, &sig_bit_p); - png_set_shift(png_ptr, sig_bit_p); - } - - /* Flip the RGB pixels to BGR (or RGBA to BGRA) */ - if (color_type & PNG_COLOR_MASK_COLOR) - png_set_bgr(png_ptr); - - /* Swap the RGBA or GA data to ARGB or AG (or BGRA to ABGR) */ - png_set_swap_alpha(png_ptr); - - /* Swap bytes of 16-bit files to least significant byte first */ - png_set_swap(png_ptr); - - /* Add filler (or alpha) byte (before/after each RGB triplet) */ - png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER); - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* Turn on interlace handling. REQUIRED if you are not using - * png_read_image(). To see how to handle interlacing passes, - * see the png_read_row() method below: - */ - number_passes = png_set_interlace_handling(png_ptr); -#else - number_passes = 1; -#endif /* PNG_READ_INTERLACING_SUPPORTED */ - - - /* Optional call to gamma correct and add the background to the palette - * and update info structure. REQUIRED if you are expecting libpng to - * update the palette for you (ie you selected such a transform above). - */ - png_read_update_info(png_ptr, info_ptr); - - /* Allocate the memory to hold the image using the fields of info_ptr. */ - - /* The easiest way to read the image: */ - png_bytep row_pointers[height]; - - /* Clear the pointer array */ - for (row = 0; row < height; row++) - row_pointers[row] = NULL; - - for (row = 0; row < height; row++) - row_pointers[row] = png_malloc(png_ptr, png_get_rowbytes(png_ptr, - info_ptr)); - - /* Now it's time to read the image. One of these methods is REQUIRED */ -#ifdef entire /* Read the entire image in one go */ - png_read_image(png_ptr, row_pointers); - -#else no_entire /* Read the image one or more scanlines at a time */ - /* The other way to read images - deal with interlacing: */ - - for (pass = 0; pass < number_passes; pass++) - { -#ifdef single /* Read the image a single row at a time */ - for (y = 0; y < height; y++) - { - png_read_rows(png_ptr, &row_pointers[y], NULL, 1); - } - -#else no_single /* Read the image several rows at a time */ - for (y = 0; y < height; y += number_of_rows) - { -#ifdef sparkle /* Read the image using the "sparkle" effect. */ - png_read_rows(png_ptr, &row_pointers[y], NULL, - number_of_rows); -#else no_sparkle /* Read the image using the "rectangle" effect */ - png_read_rows(png_ptr, NULL, &row_pointers[y], - number_of_rows); -#endif no_sparkle /* Use only one of these two methods */ - } - - /* If you want to display the image after every pass, do so here */ -#endif no_single /* Use only one of these two methods */ - } -#endif no_entire /* Use only one of these two methods */ - - /* Read rest of file, and get additional chunks in info_ptr - REQUIRED */ - png_read_end(png_ptr, info_ptr); -#endif hilevel - - /* At this point you have read the entire image */ - - /* Clean up after the read, and free any memory allocated - REQUIRED */ - png_destroy_read_struct(&png_ptr, &info_ptr, NULL); - - /* Close the file */ - fclose(fp); - - /* That's it */ - return (OK); -} - -/* Progressively read a file */ - -int -initialize_png_reader(png_structp *png_ptr, png_infop *info_ptr) -{ - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also check that - * the library version is compatible in case we are using dynamically - * linked libraries. - */ - *png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (*png_ptr == NULL) - { - *info_ptr = NULL; - return (ERROR); - } - - *info_ptr = png_create_info_struct(png_ptr); - - if (*info_ptr == NULL) - { - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - if (setjmp(png_jmpbuf((*png_ptr)))) - { - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - /* This one's new. You will need to provide all three - * function callbacks, even if you aren't using them all. - * If you aren't using all functions, you can specify NULL - * parameters. Even when all three functions are NULL, - * you need to call png_set_progressive_read_fn(). - * These functions shouldn't be dependent on global or - * static variables if you are decoding several images - * simultaneously. You should store stream specific data - * in a separate struct, given as the second parameter, - * and retrieve the pointer from inside the callbacks using - * the function png_get_progressive_ptr(png_ptr). - */ - png_set_progressive_read_fn(*png_ptr, (void *)stream_data, - info_callback, row_callback, end_callback); - - return (OK); -} - -int -process_data(png_structp *png_ptr, png_infop *info_ptr, - png_bytep buffer, png_uint_32 length) -{ - if (setjmp(png_jmpbuf((*png_ptr)))) - { - /* Free the png_ptr and info_ptr memory on error */ - png_destroy_read_struct(png_ptr, info_ptr, NULL); - return (ERROR); - } - - /* This one's new also. Simply give it chunks of data as - * they arrive from the data stream (in order, of course). - * On segmented machines, don't give it any more than 64K. - * The library seems to run fine with sizes of 4K, although - * you can give it much less if necessary (I assume you can - * give it chunks of 1 byte, but I haven't tried with less - * than 256 bytes yet). When this function returns, you may - * want to display any rows that were generated in the row - * callback, if you aren't already displaying them there. - */ - png_process_data(*png_ptr, *info_ptr, buffer, length); - return (OK); -} - -info_callback(png_structp png_ptr, png_infop info) -{ - /* Do any setup here, including setting any of the transformations - * mentioned in the Reading PNG files section. For now, you _must_ - * call either png_start_read_image() or png_read_update_info() - * after all the transformations are set (even if you don't set - * any). You may start getting rows before png_process_data() - * returns, so this is your last chance to prepare for that. - */ -} - -row_callback(png_structp png_ptr, png_bytep new_row, - png_uint_32 row_num, int pass) -{ - /* - * This function is called for every row in the image. If the - * image is interlaced, and you turned on the interlace handler, - * this function will be called for every row in every pass. - * - * In this function you will receive a pointer to new row data from - * libpng called new_row that is to replace a corresponding row (of - * the same data format) in a buffer allocated by your application. - * - * The new row data pointer "new_row" may be NULL, indicating there is - * no new data to be replaced (in cases of interlace loading). - * - * If new_row is not NULL then you need to call - * png_progressive_combine_row() to replace the corresponding row as - * shown below: - */ - - /* Get pointer to corresponding row in our - * PNG read buffer. - */ - png_bytep old_row = ((png_bytep *)our_data)[row_num]; - -#ifdef PNG_READ_INTERLACING_SUPPORTED - /* If both rows are allocated then copy the new row - * data to the corresponding row data. - */ - if ((old_row != NULL) && (new_row != NULL)) - png_progressive_combine_row(png_ptr, old_row, new_row); - - /* - * The rows and passes are called in order, so you don't really - * need the row_num and pass, but I'm supplying them because it - * may make your life easier. - * - * For the non-NULL rows of interlaced images, you must call - * png_progressive_combine_row() passing in the new row and the - * old row, as demonstrated above. You can call this function for - * NULL rows (it will just return) and for non-interlaced images - * (it just does the png_memcpy for you) if it will make the code - * easier. Thus, you can just do this for all cases: - */ - - png_progressive_combine_row(png_ptr, old_row, new_row); - - /* where old_row is what was displayed for previous rows. Note - * that the first pass (pass == 0 really) will completely cover - * the old row, so the rows do not have to be initialized. After - * the first pass (and only for interlaced images), you will have - * to pass the current row as new_row, and the function will combine - * the old row and the new row. - */ -#endif /* PNG_READ_INTERLACING_SUPPORTED */ -} - -end_callback(png_structp png_ptr, png_infop info) -{ - /* This function is called when the whole image has been read, - * including any chunks after the image (up to and including - * the IEND). You will usually have the same info chunk as you - * had in the header, although some data may have been added - * to the comments and time fields. - * - * Most people won't do much here, perhaps setting a flag that - * marks the image as finished. - */ -} - -/* Write a png file */ -void write_png(char *file_name /* , ... other image information ... */) -{ - FILE *fp; - png_structp png_ptr; - png_infop info_ptr; - png_colorp palette; - - /* Open the file */ - fp = fopen(file_name, "wb"); - if (fp == NULL) - return (ERROR); - - /* Create and initialize the png_struct with the desired error handler - * functions. If you want to use the default stderr and longjump method, - * you can supply NULL for the last three parameters. We also check that - * the library version is compatible with the one used at compile time, - * in case we are using dynamically linked libraries. REQUIRED. - */ - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - png_voidp user_error_ptr, user_error_fn, user_warning_fn); - - if (png_ptr == NULL) - { - fclose(fp); - return (ERROR); - } - - /* Allocate/initialize the image information data. REQUIRED */ - info_ptr = png_create_info_struct(png_ptr); - if (info_ptr == NULL) - { - fclose(fp); - png_destroy_write_struct(&png_ptr, NULL); - return (ERROR); - } - - /* Set error handling. REQUIRED if you aren't supplying your own - * error handling functions in the png_create_write_struct() call. - */ - if (setjmp(png_jmpbuf(png_ptr))) - { - /* If we get here, we had a problem writing the file */ - fclose(fp); - png_destroy_write_struct(&png_ptr, &info_ptr); - return (ERROR); - } - - /* One of the following I/O initialization functions is REQUIRED */ - -#ifdef streams /* I/O initialization method 1 */ - /* Set up the output control if you are using standard C streams */ - png_init_io(png_ptr, fp); - -#else no_streams /* I/O initialization method 2 */ - /* If you are using replacement write functions, instead of calling - * png_init_io() here you would call - */ - png_set_write_fn(png_ptr, (void *)user_io_ptr, user_write_fn, - user_IO_flush_function); - /* where user_io_ptr is a structure you want available to the callbacks */ -#endif no_streams /* Only use one initialization method */ - -#ifdef hilevel - /* This is the easy way. Use it if you already have all the - * image info living in the structure. You could "|" many - * PNG_TRANSFORM flags into the png_transforms integer here. - */ - png_write_png(png_ptr, info_ptr, png_transforms, NULL); - -#else - /* This is the hard way */ - - /* Set the image information here. Width and height are up to 2^31, - * bit_depth is one of 1, 2, 4, 8, or 16, but valid values also depend on - * the color_type selected. color_type is one of PNG_COLOR_TYPE_GRAY, - * PNG_COLOR_TYPE_GRAY_ALPHA, PNG_COLOR_TYPE_PALETTE, PNG_COLOR_TYPE_RGB, - * or PNG_COLOR_TYPE_RGB_ALPHA. interlace is either PNG_INTERLACE_NONE or - * PNG_INTERLACE_ADAM7, and the compression_type and filter_type MUST - * currently be PNG_COMPRESSION_TYPE_BASE and PNG_FILTER_TYPE_BASE. REQUIRED - */ - png_set_IHDR(png_ptr, info_ptr, width, height, bit_depth, PNG_COLOR_TYPE_???, - PNG_INTERLACE_????, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE); - - /* Set the palette if there is one. REQUIRED for indexed-color images */ - palette = (png_colorp)png_malloc(png_ptr, PNG_MAX_PALETTE_LENGTH - * png_sizeof(png_color)); - /* ... Set palette colors ... */ - png_set_PLTE(png_ptr, info_ptr, palette, PNG_MAX_PALETTE_LENGTH); - /* You must not free palette here, because png_set_PLTE only makes a link to - * the palette that you malloced. Wait until you are about to destroy - * the png structure. - */ - - /* Optional significant bit (sBIT) chunk */ - png_color_8 sig_bit; - - /* If we are dealing with a grayscale image then */ - sig_bit.gray = true_bit_depth; - - /* Otherwise, if we are dealing with a color image then */ - sig_bit.red = true_red_bit_depth; - sig_bit.green = true_green_bit_depth; - sig_bit.blue = true_blue_bit_depth; - - /* If the image has an alpha channel then */ - sig_bit.alpha = true_alpha_bit_depth; - - png_set_sBIT(png_ptr, info_ptr, &sig_bit); - - - /* Optional gamma chunk is strongly suggested if you have any guess - * as to the correct gamma of the image. - */ - png_set_gAMA(png_ptr, info_ptr, gamma); - - /* Optionally write comments into the image */ - { - png_text text_ptr[3]; - - char key0[]="Title"; - char text0[]="Mona Lisa"; - text_ptr[0].key = key0; - text_ptr[0].text = text0; - text_ptr[0].compression = PNG_TEXT_COMPRESSION_NONE; - text_ptr[0].itxt_length = 0; - text_ptr[0].lang = NULL; - text_ptr[0].lang_key = NULL; - - char key1[]="Author"; - char text1[]="Leonardo DaVinci"; - text_ptr[1].key = key1; - text_ptr[1].text = text1; - text_ptr[1].compression = PNG_TEXT_COMPRESSION_NONE; - text_ptr[1].itxt_length = 0; - text_ptr[1].lang = NULL; - text_ptr[1].lang_key = NULL; - - char key2[]="Description"; - char text2[]=""; - text_ptr[2].key = key2; - text_ptr[2].text = text2; - text_ptr[2].compression = PNG_TEXT_COMPRESSION_zTXt; - text_ptr[2].itxt_length = 0; - text_ptr[2].lang = NULL; - text_ptr[2].lang_key = NULL; - - png_set_text(write_ptr, write_info_ptr, text_ptr, 3); - } - - /* Other optional chunks like cHRM, bKGD, tRNS, tIME, oFFs, pHYs */ - - /* Note that if sRGB is present the gAMA and cHRM chunks must be ignored - * on read and, if your application chooses to write them, they must - * be written in accordance with the sRGB profile - */ - - /* Write the file header information. REQUIRED */ - png_write_info(png_ptr, info_ptr); - - /* If you want, you can write the info in two steps, in case you need to - * write your private chunk ahead of PLTE: - * - * png_write_info_before_PLTE(write_ptr, write_info_ptr); - * write_my_chunk(); - * png_write_info(png_ptr, info_ptr); - * - * However, given the level of known- and unknown-chunk support in 1.2.0 - * and up, this should no longer be necessary. - */ - - /* Once we write out the header, the compression type on the text - * chunk gets changed to PNG_TEXT_COMPRESSION_NONE_WR or - * PNG_TEXT_COMPRESSION_zTXt_WR, so it doesn't get written out again - * at the end. - */ - - /* Set up the transformations you want. Note that these are - * all optional. Only call them if you want them. - */ - - /* Invert monochrome pixels */ - png_set_invert_mono(png_ptr); - - /* Shift the pixels up to a legal bit depth and fill in - * as appropriate to correctly scale the image. - */ - png_set_shift(png_ptr, &sig_bit); - - /* Pack pixels into bytes */ - png_set_packing(png_ptr); - - /* Swap location of alpha bytes from ARGB to RGBA */ - png_set_swap_alpha(png_ptr); - - /* Get rid of filler (OR ALPHA) bytes, pack XRGB/RGBX/ARGB/RGBA into - * RGB (4 channels -> 3 channels). The second parameter is not used. - */ - png_set_filler(png_ptr, 0, PNG_FILLER_BEFORE); - - /* Flip BGR pixels to RGB */ - png_set_bgr(png_ptr); - - /* Swap bytes of 16-bit files to most significant byte first */ - png_set_swap(png_ptr); - - /* Swap bits of 1-bit, 2-bit, 4-bit packed pixel formats */ - png_set_packswap(png_ptr); - - /* Turn on interlace handling if you are not using png_write_image() */ - if (interlacing != 0) - number_passes = png_set_interlace_handling(png_ptr); - - else - number_passes = 1; - - /* The easiest way to write the image (you may have a different memory - * layout, however, so choose what fits your needs best). You need to - * use the first method if you aren't handling interlacing yourself. - */ - png_uint_32 k, height, width; - - /* In this example, "image" is a one-dimensional array of bytes */ - png_byte image[height*width*bytes_per_pixel]; - - png_bytep row_pointers[height]; - - if (height > PNG_UINT_32_MAX/png_sizeof(png_bytep)) - png_error (png_ptr, "Image is too tall to process in memory"); - - /* Set up pointers into your "image" byte array */ - for (k = 0; k < height; k++) - row_pointers[k] = image + k*width*bytes_per_pixel; - - /* One of the following output methods is REQUIRED */ - -#ifdef entire /* Write out the entire image data in one call */ - png_write_image(png_ptr, row_pointers); - - /* The other way to write the image - deal with interlacing */ - -#else no_entire /* Write out the image data by one or more scanlines */ - - /* The number of passes is either 1 for non-interlaced images, - * or 7 for interlaced images. - */ - for (pass = 0; pass < number_passes; pass++) - { - /* Write a few rows at a time. */ - png_write_rows(png_ptr, &row_pointers[first_row], number_of_rows); - - /* If you are only writing one row at a time, this works */ - for (y = 0; y < height; y++) - png_write_rows(png_ptr, &row_pointers[y], 1); - } -#endif no_entire /* Use only one output method */ - - /* You can write optional chunks like tEXt, zTXt, and tIME at the end - * as well. Shouldn't be necessary in 1.2.0 and up as all the public - * chunks are supported and you can use png_set_unknown_chunks() to - * register unknown chunks into the info structure to be written out. - */ - - /* It is REQUIRED to call this to finish writing the rest of the file */ - png_write_end(png_ptr, info_ptr); -#endif hilevel - - /* If you png_malloced a palette, free it here (don't free info_ptr->palette, - * as recommended in versions 1.0.5m and earlier of this example; if - * libpng mallocs info_ptr->palette, libpng will free it). If you - * allocated it with malloc() instead of png_malloc(), use free() instead - * of png_free(). - */ - png_free(png_ptr, palette); - palette = NULL; - - /* Similarly, if you png_malloced any data that you passed in with - * png_set_something(), such as a hist or trans array, free it here, - * when you can be sure that libpng is through with it. - */ - png_free(png_ptr, trans); - trans = NULL; - /* Whenever you use png_free() it is a good idea to set the pointer to - * NULL in case your application inadvertently tries to png_free() it - * again. When png_free() sees a NULL it returns without action, thus - * avoiding the double-free security problem. - */ - - /* Clean up after the write, and free any memory allocated */ - png_destroy_write_struct(&png_ptr, &info_ptr); - - /* Close the file */ - fclose(fp); - - /* That's it */ - return (OK); -} - -#endif /* if 0 */