From 6524c95bb8ea0339908ab9bff03211f8c42e77d9 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Thu, 3 Aug 2006 20:45:57 +0200
Subject: add TIFFOutputImage

---
 src/TIFFOutputImage.cxx | 110 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 src/TIFFOutputImage.cxx

(limited to 'src/TIFFOutputImage.cxx')

diff --git a/src/TIFFOutputImage.cxx b/src/TIFFOutputImage.cxx
new file mode 100644
index 0000000..ed9213f
--- /dev/null
+++ b/src/TIFFOutputImage.cxx
@@ -0,0 +1,110 @@
+// 
+// Copyright 2006 by Johannes Hofmann
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Library General Public
+// License as published by the Free Software Foundation; either
+// version 2 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Library General Public License for more details.
+//
+// You should have received a copy of the GNU Library General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+// USA.
+//
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "TIFFOutputImage.H"
+
+TIFFOutputImage::TIFFOutputImage(const char *f) {
+	file = strdup(f);
+	tiff = NULL;
+	row = NULL;
+}
+
+TIFFOutputImage::~TIFFOutputImage() {
+	if (row) {
+		free(row);
+	}
+	if (file) {
+		free(file);
+	}
+}
+
+int
+TIFFOutputImage::init_internal(int w1, int h1) {
+	if (row) {
+		free(row);
+		row = NULL;
+	}
+
+	row = (unsigned char*) malloc(sizeof(char) * 4 * w1);
+	if (!row) {
+		perror("malloc");
+		return 1;
+	}
+	memset(row, 0, sizeof(char) * 4 * w1);
+
+	if (tiff) {
+		TIFFClose(tiff);
+	}
+
+	if((tiff = TIFFOpen(file, "w")) == NULL){
+		fprintf(stderr, "can't open %s\n", file);
+		return 1;
+	}
+
+	TIFFSetField(tiff, TIFFTAG_IMAGEWIDTH, w1);
+	TIFFSetField(tiff, TIFFTAG_IMAGELENGTH, h1);
+	TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE);
+	TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
+	TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+	TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8);
+	TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 4);
+
+	return 0;
+}
+
+int
+TIFFOutputImage::set_pixel_internal(int x, char r, char g, char b) {
+	row[x*4+0] = r;
+	row[x*4+1] = g;
+	row[x*4+2] = b;
+	row[x*4+3] = 255;
+
+	return 0;
+}
+
+int
+TIFFOutputImage::next_line_internal() {
+	int ret;
+	ret = TIFFWriteScanline(tiff, row, line-1, 0);
+	if (ret != 1) {
+		fprintf(stderr, "TIFFWriteScanline failed\n");
+	}
+	memset(row, 0, sizeof(char) * 4 * W);
+	return 0;
+}
+
+int
+TIFFOutputImage::done_internal() {
+	if (tiff) {
+		TIFFClose(tiff);
+		tiff = NULL;
+	}
+
+	if (row) {
+		free(row);
+		row = NULL;
+	}
+
+	return 0;
+}	
+
-- 
cgit v1.2.3


From f3575d9ccfc61beca36ef40dc20b625cbc2f1368 Mon Sep 17 00:00:00 2001
From: Johannes Hofmann <Johannes.Hofmann@gmx.de>
Date: Thu, 3 Aug 2006 21:12:39 +0200
Subject: use TIFFWriteEncodedStrip instead of TIFFWriteScanline because of mem
 usage of libtiff.

---
 src/TIFFOutputImage.cxx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/TIFFOutputImage.cxx')

diff --git a/src/TIFFOutputImage.cxx b/src/TIFFOutputImage.cxx
index ed9213f..b8433ca 100644
--- a/src/TIFFOutputImage.cxx
+++ b/src/TIFFOutputImage.cxx
@@ -66,6 +66,7 @@ TIFFOutputImage::init_internal(int w1, int h1) {
 	TIFFSetField(tiff, TIFFTAG_COMPRESSION, COMPRESSION_DEFLATE);
 	TIFFSetField(tiff, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
 	TIFFSetField(tiff, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
+	TIFFSetField(tiff, TIFFTAG_ROWSPERSTRIP, 1);
 	TIFFSetField(tiff, TIFFTAG_BITSPERSAMPLE, 8);
 	TIFFSetField(tiff, TIFFTAG_SAMPLESPERPIXEL, 4);
 
@@ -85,10 +86,9 @@ TIFFOutputImage::set_pixel_internal(int x, char r, char g, char b) {
 int
 TIFFOutputImage::next_line_internal() {
 	int ret;
-	ret = TIFFWriteScanline(tiff, row, line-1, 0);
-	if (ret != 1) {
-		fprintf(stderr, "TIFFWriteScanline failed\n");
-	}
+
+	TIFFWriteEncodedStrip(tiff, line -1 , row, W * 4);
+
 	memset(row, 0, sizeof(char) * 4 * W);
 	return 0;
 }
-- 
cgit v1.2.3