From b679317c94cacc76e98ba827d027b8594b5809a1 Mon Sep 17 00:00:00 2001
From: "Mirar (Pontus Hagland)" <pike@sort.mirar.org>
Date: Thu, 26 Feb 1998 22:38:01 +0100
Subject: [PATCH] PNG initial import
Rev: src/modules/_Image_PNG/.cvsignore:1.1
Rev: src/modules/_Image_PNG/Makefile.in:1.1
Rev: src/modules/_Image_PNG/acconfig.h:1.1
Rev: src/modules/_Image_PNG/configure.in:1.1
Rev: src/modules/_Image_PNG/image_png.c:1.1
Rev: src/modules/_Image_PNG/testsuite.in:1.1
---
.gitattributes | 2 +
src/modules/_Image_PNG/.cvsignore | 14 ++
src/modules/_Image_PNG/.gitignore | 14 ++
src/modules/_Image_PNG/Makefile.in | 7 +
src/modules/_Image_PNG/acconfig.h | 14 ++
src/modules/_Image_PNG/configure.in | 35 +++++
src/modules/_Image_PNG/image_png.c | 218 ++++++++++++++++++++++++++++
src/modules/_Image_PNG/testsuite.in | 3 +
8 files changed, 307 insertions(+)
create mode 100644 src/modules/_Image_PNG/.cvsignore
create mode 100644 src/modules/_Image_PNG/.gitignore
create mode 100644 src/modules/_Image_PNG/Makefile.in
create mode 100644 src/modules/_Image_PNG/acconfig.h
create mode 100644 src/modules/_Image_PNG/configure.in
create mode 100644 src/modules/_Image_PNG/image_png.c
create mode 100644 src/modules/_Image_PNG/testsuite.in
diff --git a/.gitattributes b/.gitattributes
index 2586aa6136..3d754c384f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -158,6 +158,8 @@ testfont binary
/src/modules/_Crypto/rc4.c foreign_ident
/src/modules/_Crypto/test_crypto.pike foreign_ident
/src/modules/_Image_JPEG/acconfig.h foreign_ident
+/src/modules/_Image_PNG/acconfig.h foreign_ident
+/src/modules/_Image_PNG/image_png.c foreign_ident
/src/modules/_Image_XFace/acconfig.h foreign_ident
/src/modules/_Image_XFace/image_xface.c foreign_ident
/src/modules/call_out/call_out.c foreign_ident
diff --git a/src/modules/_Image_PNG/.cvsignore b/src/modules/_Image_PNG/.cvsignore
new file mode 100644
index 0000000000..4c4abb584f
--- /dev/null
+++ b/src/modules/_Image_PNG/.cvsignore
@@ -0,0 +1,14 @@
+.pure
+Makefile
+config.log
+config.status
+configure
+dependencies
+linker_options
+modlist_headers
+modlist_segment
+module_testsuite
+stamp-h
+stamp-h.in
+config.h
+config.h.in
diff --git a/src/modules/_Image_PNG/.gitignore b/src/modules/_Image_PNG/.gitignore
new file mode 100644
index 0000000000..e9be9e8773
--- /dev/null
+++ b/src/modules/_Image_PNG/.gitignore
@@ -0,0 +1,14 @@
+/.pure
+/Makefile
+/config.log
+/config.status
+/configure
+/dependencies
+/linker_options
+/modlist_headers
+/modlist_segment
+/module_testsuite
+/stamp-h
+/stamp-h.in
+/config.h
+/config.h.in
diff --git a/src/modules/_Image_PNG/Makefile.in b/src/modules/_Image_PNG/Makefile.in
new file mode 100644
index 0000000000..2435417084
--- /dev/null
+++ b/src/modules/_Image_PNG/Makefile.in
@@ -0,0 +1,7 @@
+SRCDIR=@srcdir@
+VPATH=@srcdir@:@srcdir@/../..:../..
+OBJS=image_png.o
+MODULE_LDFLAGS=@LDFLAGS@ @LIBS@
+
+@dynamic_module_makefile@
+@dependencies@
diff --git a/src/modules/_Image_PNG/acconfig.h b/src/modules/_Image_PNG/acconfig.h
new file mode 100644
index 0000000000..9a9d556ca4
--- /dev/null
+++ b/src/modules/_Image_PNG/acconfig.h
@@ -0,0 +1,14 @@
+/*
+ * $Id: acconfig.h,v 1.1 1998/02/26 21:38:00 mirar Exp $
+ */
+
+#ifndef GMP_MACHINE_H
+#define GMP_MACHINE_H
+
+@TOP@
+@BOTTOM@
+
+/* Define this if you have -lz */
+#undef HAVE_LIBZ
+
+#endif
diff --git a/src/modules/_Image_PNG/configure.in b/src/modules/_Image_PNG/configure.in
new file mode 100644
index 0000000000..88b8c06080
--- /dev/null
+++ b/src/modules/_Image_PNG/configure.in
@@ -0,0 +1,35 @@
+AC_INIT(image_png.c)
+AC_CONFIG_HEADER(config.h)
+AC_ARG_WITH(zlib, [ --with(out)-zlib Support gzip compression],[],[with_zlib=yes])
+
+sinclude(../module_configure.in)
+
+if test x$with_zlib = xyes ; then
+ AC_CHECK_HEADERS(zlib.h)
+ if test $ac_cv_header_zlib_h = yes ; then
+ AC_MSG_CHECKING([if libz.h is new enough])
+ AC_TRY_LINK([
+#include <zlib.h>
+ ],[
+int foo = (int)(Z_NO_COMPRESSION | Z_VERSION_ERROR);
+ ],[ AC_MSG_RESULT(yes) ],[ AC_MSG_RESULT(no); ac_cv_header_zlib_h=no ])
+ if test $ac_cv_header_zlib_h = yes ; then
+ if test x$pike_cv_sys_os = xIRIX ; then
+ # The libz.so supplied with IRIX 6.3 needs these obscure symbols
+ # C++? It also differs which library which contains them.
+ AC_CHECK_LIB(Csup, __vtbl__9type_info)
+ AC_CHECK_LIB(C, __vtbl__9type_info)
+ AC_CHECK_LIB(Csup, __T_9__nothrow)
+ AC_HAVE_FUNCS(__vtbl__9type_info)
+ AC_HAVE_FUNCS(__T_9__nothrow)
+ fi
+ AC_CHECK_LIB(z, compress, [
+ AC_DEFINE(HAVE_LIBZ)
+ LIBS="${LIBS-} -lz"
+ ] ,
+ AC_CHECK_LIB(gz, compress))
+ fi
+ fi
+fi
+
+AC_OUTPUT(Makefile,echo FOO >stamp-h )
diff --git a/src/modules/_Image_PNG/image_png.c b/src/modules/_Image_PNG/image_png.c
new file mode 100644
index 0000000000..5f84aa2d48
--- /dev/null
+++ b/src/modules/_Image_PNG/image_png.c
@@ -0,0 +1,218 @@
+#include "global.h"
+RCSID("$Id: image_png.c,v 1.1 1998/02/26 21:38:01 mirar Exp $");
+
+#include "config.h"
+
+#if !defined(HAVE_LIBZ) && !defined(HAVE_LIBGZ)
+#undef HAVE_ZLIB_H
+#endif
+
+#include "pike_macros.h"
+#include "object.h"
+#include "constants.h"
+#include "interpret.h"
+#include "svalue.h"
+#include "threads.h"
+#include "array.h"
+#include "mapping.h"
+#include "error.h"
+#include "stralloc.h"
+#include "dynamic_buffer.h"
+
+#ifdef HAVE_ZLIB
+
+#include <zlib.h>
+#include "../Image/image.h"
+
+static struct program *image_program=NULL;
+static struct program *colortable_program=NULL;
+
+#endif /* HAVE_ZLIB */
+
+static struct pike_string *param_blu;
+static struct pike_string *param_blaa;
+
+#ifdef HAVE_JPEGLIB_H
+
+/*
+**! module Image
+**! submodule PNG
+**!
+**! note
+**! This module uses <tt>zlib</tt>.
+*/
+
+static void push_png_chunk(unsigned char *type, /* 4 bytes */
+ struct pike_string *data)
+{
+ /*
+ * 0: 4 bytes of length of data block (=n)
+ * 4: 4 bytes of chunk type
+ * 8: n bytes of data
+ * 8+n: 4 bytes of CRC
+ */
+
+ push_nbo_32bit(data->len);
+ push_string(make_binary_shared_string(4,type));
+ push_string(data);
+ push_nbo_32bit(crc32(crc32(0,NULL,0),data->str,data->len));
+ f_add(4);
+}
+
+/*
+**! method string _chunk(string type,string data)
+**! Encodes a PNG chunk.
+**!
+**! note
+**! Please read about the PNG file format.
+*/
+
+static void image_png_chunk(INT32 args)
+{
+ struct pike_string *a,*b;
+
+ if (args!=2 ||
+ sp[-args].type!=T_STRING ||
+ sp[1-args].type!=T_STRING)
+ error("Image.PNG.chunk: Illegal argument(s)\n");
+
+ a=sp[-args].u.string;
+ if (a->len!=4)
+ error("Image.PNG.chunk: Type string not 4 characters\n");
+ b=sp[1-args].u.string;
+ pop_n_elems(args-2);
+ sp-=2;
+ push_png_chunk(a->str,b);
+ free_string(a);
+ free_string(b);
+}
+
+
+/*
+**! method string encode(object image)
+**! method string encode(object image, mapping options)
+**! Encodes a PNG image.
+**!
+**! The <tt>options</tt> argument may be a mapping
+**! containing zero or more encoding options:
+**!
+**! <pre>
+**! normal options:
+**! "quality":0..100
+**! Set quality of result. Default is 75.
+**! "optimize":0|1
+**! Optimize Huffman table. Default is on (1) for
+**! images smaller than 50kpixels.
+**! "progressive":0|1
+**! Make a progressive JPEG. Default is off.
+**!
+**! advanced options:
+**! "smooth":1..100
+**! Smooth input. Value is strength.
+**! "method":JPEG.IFAST|JPEG.ISLOW|JPEG.FLOAT|JPEG.DEFAULT|JPEG.FASTEST
+**! DCT method to use.
+**! DEFAULT and FASTEST is from the jpeg library,
+**! probably ISLOW and IFAST respective.
+**!
+**! wizard options:
+**! "baseline":0|1
+**! Force baseline output. Useful for quality<20.
+**! </pre>
+**!
+**! note
+**! Please read some about JPEG files. A quality
+**! setting of 100 does not mean the result is
+**! lossless.
+*/
+
+static void image_jpeg_encode(INT32 args)
+{
+}
+
+/*
+**! method object decode(string data)
+**! method object decode(string data, mapping options)
+**! Decodes a PNG image.
+**!
+**! The <tt>options</tt> argument may be a mapping
+**! containing zero or more encoding options:
+**!
+**! <pre>
+**! advanced options:
+**! "block_smoothing":0|1
+**! Do interblock smoothing. Default is on (1).
+**! "fancy_upsampling":0|1
+**! Do fancy upsampling of chroma components.
+**! Default is on (1).
+**! "method":JPEG.IFAST|JPEG.ISLOW|JPEG.FLOAT|JPEG.DEFAULT|JPEG.FASTEST
+**! DCT method to use.
+**! DEFAULT and FASTEST is from the jpeg library,
+**! probably ISLOW and IFAST respective.
+**!
+**! wizard options:
+**! "scale_num":1..
+**! "scale_denom":1..
+**! Rescale the image when read from JPEG data.
+**! My (Mirar) version (6a) of jpeglib can only handle
+**! 1/1, 1/2, 1/4 and 1/8.
+**!
+**! </pre>
+**!
+**! note
+**! Please read some about JPEG files.
+*/
+
+static void image_jpeg_decode(INT32 args)
+{
+}
+
+#endif /* HAVE_JPEGLIB_H */
+
+/*** module init & exit & stuff *****************************************/
+
+void f_index(INT32 args);
+
+void pike_module_exit(void)
+{
+}
+
+void pike_module_init(void)
+{
+#ifdef HAVE_JPEGLIB_H
+ push_string(make_shared_string("Image"));
+ push_int(0);
+ SAFE_APPLY_MASTER("resolv",2);
+ if (sp[-1].type==T_OBJECT)
+ {
+ push_string(make_shared_string("image"));
+ f_index(2);
+ image_program=program_from_svalue(sp-1);
+ }
+ pop_n_elems(1);
+
+ push_string(make_shared_string("Image"));
+ push_int(0);
+ SAFE_APPLY_MASTER("resolv",2);
+ if (sp[-1].type==T_OBJECT)
+ {
+ push_string(make_shared_string("colortable"));
+ f_index(2);
+ image_program=program_from_svalue(sp-1);
+ }
+ pop_n_elems(1);
+
+ if (image_program && image_colortable)
+ {
+ add_function("decode",image_png__chunk,
+ "function(string,string:string)",
+ OPT_TRY_OPTIMIZE);
+ add_function("decode",image_png_decode,
+ "function(string,void|mapping(string:int):object)",0);
+ add_function("encode",image_png_encode,
+ "function(object,void|mapping(string:int):string)",
+ OPT_TRY_OPTIMIZE);
+ }
+
+#endif /* HAVE_JPEGLIB_H */
+
+}
diff --git a/src/modules/_Image_PNG/testsuite.in b/src/modules/_Image_PNG/testsuite.in
new file mode 100644
index 0000000000..235283e0f8
--- /dev/null
+++ b/src/modules/_Image_PNG/testsuite.in
@@ -0,0 +1,3 @@
+cond([[ master()->resolv("_Image_JPEG")->encode ]],
+[[
+]])
--
GitLab