* The PNGDump stuff is no longer used.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32516 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/kits/interface/Jamfile

@@ -25,17 +25,9 @@ if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
 
 SetSubDirSupportedPlatforms haiku libbe_test ;
 
-UseLibraryHeaders agg ;
+UseLibraryHeaders agg icon ;
 UsePrivateHeaders app input print interface shared tracker ;
 
-local pngDump ;
-if $(TARGET_PLATFORM) = haiku {
-	UseLibraryHeaders icon ;
-} else {
-	pngDump = PNGDump.cpp ;
-	UseLibraryHeaders icon png zlib ;
-}
-
 SEARCH_SOURCE += [ FDirName $(SUBDIR) textview_support ] ;
 SEARCH_SOURCE += [ FDirName $(SUBDIR) layouter ] ;
 
@@ -145,8 +137,6 @@ MergeObject <libbe>interface_kit.o :
 	OneElementLayouter.cpp
 	SimpleLayouter.cpp
 
-	# required on R5
-	$(pngDump)
 	: libshared.a
 ;
 

src/kits/interface/PNGDump.cpp

@@ -1,199 +0,0 @@
-/*
- * Copyright 2001-2006, Haiku.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		DarkWyrm <[email protected]>
- *		Stephan Aßmus <[email protected]>
- */
-
-/**	Function for saving a generic framebuffer to a PNG file */
-
-#include "PNGDump.h"
-
-#include <InterfaceDefs.h>
-#include <NodeInfo.h>
-#include <Rect.h>
-
-#include <png.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-
-#define TRACE_PNGDUMP
-#ifdef TRACE_PNGDUMP
-#	define TRACE(x) printf x
-#else
-#	define TRACE(x) ;
-#endif
-
-
-status_t
-SaveToPNG(const char* filename, const BRect& bounds, color_space space,
-	const void* bits, int32 bitsLength, int32 bytesPerRow)
-{
-	int32 width = bounds.IntegerWidth() + 1;
-	int32 height = bounds.IntegerHeight() + 1;
-
-	TRACE(("SaveToPNG: %s (%ldx%ld)\n", filename, width, height));
-
-	FILE *file = fopen(filename, "wb");
-	if (file == NULL) {
-		TRACE(("Couldn't open file: %s\n", strerror(errno)));
-		return errno;
-	}
-
-	png_structp png = png_create_write_struct(PNG_LIBPNG_VER_STRING,
-		NULL, NULL, NULL);
-	if (png == NULL) {
-		TRACE(("Couldn't create write struct\n"));
-		fclose(file);
-		return B_NO_MEMORY;
-	}
-
-	png_infop info = png_create_info_struct(png);
-	if (info == NULL) {
-		TRACE(("Couldn't create info struct\n"));
-		png_destroy_write_struct(&png, NULL);
-		fclose(file);
-		return B_NO_MEMORY;
-	}
-
-	if (setjmp(png->jmpbuf)) {
-		png_destroy_write_struct(&png, NULL);
-		fclose(file);
-		return B_ERROR;
-	}
-
-	png_init_io(png, file);
-	png_set_bgr(png);
-
-	// TODO: support other color spaces if needed
-
-	switch (space) {
-		case B_RGB32:
-		case B_RGBA32:
-		{
-			// create file without alpha channel
-			png_set_IHDR(png, info, width, height, 8, PNG_COLOR_TYPE_RGB,
-				PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-				PNG_FILTER_TYPE_DEFAULT);
-			png_write_info(png, info);
-
-			// convert from 32 bit RGB to 24 bit RGB while saving
-			png_byte* src = (png_byte*)bits;
-			int srcRowBytes = width * 4;
-			int dstRowBytes = width * 3;
-			int srcRowOffset = bytesPerRow - srcRowBytes;
-			png_byte tempRow[dstRowBytes];
-			for (int row = 0; row < height; row++) {
-				for (int i = 0; i < dstRowBytes; i += 3, src += 4) {
-					tempRow[i]     = src[0];
-					tempRow[i + 1] = src[1];
-					tempRow[i + 2] = src[2];
-				}
-				src += srcRowOffset;
-				png_write_row(png, tempRow);
-			}
-			break;
-		}
-
-		case B_RGB16:
-		{
-			// create file without alpha channel
-			png_set_IHDR(png, info, width, height, 8, PNG_COLOR_TYPE_RGB,
-				PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-				PNG_FILTER_TYPE_DEFAULT);
-			png_write_info(png, info);
-
-			// convert from 16 bit RGB to 24 bit RGB while saving
-			uint16* src = (uint16 *)bits;
-			int dstRowBytes = width * 3;
-			png_byte tempRow[dstRowBytes];
-			for (int row = 0; row < height; row++) {
-				for (int i = 0; i < dstRowBytes; i += 3, src++) {
-					tempRow[i + 2] = (*src & 0xf800) >> 8;
-					tempRow[i + 1] = (*src & 0x07e0) >> 3;
-					tempRow[i] = (*src & 0x001f) << 3;
-				}
-				src = (uint16 *)((uint8 *)bits + row * bytesPerRow);
-				png_write_row(png, tempRow);
-			}
-			break;
-		}
-
-		case B_RGB15:
-		{
-			// create file without alpha channel
-			png_set_IHDR(png, info, width, height, 8, PNG_COLOR_TYPE_RGB,
-				PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-				PNG_FILTER_TYPE_DEFAULT);
-			png_write_info(png, info);
-
-			// convert from 15 bit RGB to 24 bit RGB while saving
-			uint16* src = (uint16 *)bits;
-			int dstRowBytes = width * 3;
-			png_byte tempRow[dstRowBytes];
-			for (int row = 0; row < height; row++) {
-				for (int i = 0; i < dstRowBytes; i += 3, src++) {
-					tempRow[i + 2] = (*src & 0x7c00) >> 7;
-					tempRow[i + 1] = (*src & 0x03e0) >> 2;
-					tempRow[i] = (*src & 0x001f) << 3;
-				}
-				src = (uint16 *)((uint8 *)bits + row * bytesPerRow);
-				png_write_row(png, tempRow);
-			}
-			break;
-		}
-
-		case B_CMAP8:
-		{
-			// create file without alpha channel
-			png_set_IHDR(png, info, width, height, 8, PNG_COLOR_TYPE_RGB,
-				PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-				PNG_FILTER_TYPE_DEFAULT);
-			png_write_info(png, info);
-
-			// convert from 8 bit CMAP to 24 bit RGB while saving
-			const color_map *colorMap = system_colors();
-			uint8* src = (uint8 *)bits;
-			int dstRowBytes = width * 3;
-			png_byte tempRow[dstRowBytes];
-			for (int row = 0; row < height; row++) {
-				for (int i = 0; i < dstRowBytes; i += 3, src++) {
-					tempRow[i + 2] = colorMap->color_list[*src].red;
-					tempRow[i + 1] = colorMap->color_list[*src].green;
-					tempRow[i] = colorMap->color_list[*src].blue;
-				}
-				src = (uint8 *)bits + row * bytesPerRow;
-				png_write_row(png, tempRow);
-			}
-			break;
-		}
-		
-		default:
-		{
-			TRACE(("Unsupported color space %x\n", space));
-			png_destroy_write_struct(&png, NULL);
-			fclose(file);
-			return B_ERROR;
-		}
-	}
-
-	png_write_end(png, info);
-	png_destroy_write_struct(&png, NULL);
-
-	fclose(file);
-
-	// Set the file type manually, so that it doesn't have to be
-	// picked up by the registrar or Tracker, first
-	BNode node(filename);
-	BNodeInfo nodeInfo(&node);
-	if (nodeInfo.InitCheck() == B_OK)
-		nodeInfo.SetType("image/png");
-
-	return B_OK;
-}

src/kits/interface/PNGDump.h

@@ -1,20 +0,0 @@
-/*
- * Copyright 2001-2005, Haiku.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- *		DarkWyrm <[email protected]>
- */
-#ifndef PNGDUMP_H
-#define PNGDUMP_H
-
-
-#include <GraphicsDefs.h>
-
-class BRect;
-
-
-status_t SaveToPNG(const char* filename, const BRect& bounds, color_space space, 
-			const void* bits, int32 bitsLength, int32 bytesPerRow);
-
-#endif