From 2a7604a5f909115a5fd633f4a058b1890b13d7ef Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 1 Aug 2006 16:03:46 +0200 Subject: add OutputImage stuff --- src/JPEGOutputImage.H | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/JPEGOutputImage.H (limited to 'src/JPEGOutputImage.H') diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H new file mode 100644 index 0000000..2a56bca --- /dev/null +++ b/src/JPEGOutputImage.H @@ -0,0 +1,38 @@ +// +// 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. +// + +#ifndef JPEGOUTPUTIMAGE_H +#define JPEGOUTPUTIMAGE_H + + +class JPEGOutputImage : OutputImage { + public: + JPEGOutputImage(); + + ~JPEGOutputImage(); + + int init(int w, int h); + + protected: + int set_pixel_internal(int x, char r, char g, char b); + + int next_line_internal(); +}; + +#endif -- cgit v1.2.3 From 97f03d296d77284c723d9ff8485fed51dc17c32c Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 1 Aug 2006 16:30:44 +0200 Subject: implement OutputImage stuff --- src/JPEGOutputImage.H | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/JPEGOutputImage.H') diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index 2a56bca..23ca25c 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -29,6 +29,8 @@ class JPEGOutputImage : OutputImage { int init(int w, int h); + int done(); + protected: int set_pixel_internal(int x, char r, char g, char b); -- cgit v1.2.3 From d40e2b31d77face2fb65c41cc4d901f01c5de5d1 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 1 Aug 2006 22:40:33 +0200 Subject: implement JPEGOutputImage --- src/JPEGOutputImage.H | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'src/JPEGOutputImage.H') diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index 23ca25c..bf1c6c1 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -20,21 +20,36 @@ #ifndef JPEGOUTPUTIMAGE_H #define JPEGOUTPUTIMAGE_H +#include +extern "C" { +#include +} + +#include "OutputImage.H" class JPEGOutputImage : OutputImage { + private: + unsigned char *row; + char *file; + int w, h; + struct jpeg_compress_struct cinfo; + struct jpeg_error_mgr jerr; + FILE *fp; + int quality; + public: - JPEGOutputImage(); + JPEGOutputImage(const char *file, int quality = 90); ~JPEGOutputImage(); - - int init(int w, int h); - - int done(); protected: + int init_internal(int w, int h); + int set_pixel_internal(int x, char r, char g, char b); int next_line_internal(); + + int done_internal(); }; #endif -- cgit v1.2.3 From 52669d81a766eacc1b4e60d0cf477e35b598fcbe Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 2 Aug 2006 17:12:55 +0200 Subject: change Stitch to use OutputImage instead of DataImage --- src/JPEGOutputImage.H | 1 + 1 file changed, 1 insertion(+) (limited to 'src/JPEGOutputImage.H') diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index bf1c6c1..31bdd76 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -23,6 +23,7 @@ #include extern "C" { #include +#undef HAVE_STDLIB_H } #include "OutputImage.H" -- cgit v1.2.3 From 699556f7efcf6a9af39c37bd0c881ee3edc21da3 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Wed, 2 Aug 2006 18:21:54 +0200 Subject: add JPEGOutputImage.cxx --- src/JPEGOutputImage.H | 1 - 1 file changed, 1 deletion(-) (limited to 'src/JPEGOutputImage.H') diff --git a/src/JPEGOutputImage.H b/src/JPEGOutputImage.H index 31bdd76..50570e5 100644 --- a/src/JPEGOutputImage.H +++ b/src/JPEGOutputImage.H @@ -32,7 +32,6 @@ class JPEGOutputImage : OutputImage { private: unsigned char *row; char *file; - int w, h; struct jpeg_compress_struct cinfo; struct jpeg_error_mgr jerr; FILE *fp; -- cgit v1.2.3