Merge branch 'bhazuka-master'

Author: drotiro

.gitignore

@@ -5,3 +5,4 @@ build
 dist
 utils/postpic_import
 utils/postpic_export
+server/sql/postpic--0.9.1.sql

server/Makefile

@@ -1,15 +1,33 @@
-# GraphicsMagick's configuration info
+#GraphicsMagick's configuration info
 GMCONF = GraphicsMagick-config
 GMFLAGS = `${GMCONF} --cppflags --cflags`
 GMLIBS = `${GMCONF} --libs`
 
 # info for pgxs
-OBJS = postpic.o
-MODULE_big = postpic
-DATA = postpic.sql
 PG_CPPFLAGS = ${GMFLAGS}
-SHLIB_LINK = ${GMLIBS}
+SHLIB_LINK  = ${GMLIBS}
+PG_CONFIG   = pg_config
+
+EXTENSION  = postpic
+EXTVERSION = $(shell grep default_version $(EXTENSION).control | \
+	     sed -e "s/default_version[[:space:]]*=[[:space:]]*'\\([^']*\\)'/\\1/")
+
+MODULES    = $(patsubst %.c,%,$(wildcard src/*.c))
+
+DATA       = $(filter-out $(wildcard sql/*--*.sql),$(wildcard sql/*.sql))
+TESTS      = $(wildcard test/sql/*.sql)
+DOCS       = $(wildcard ../*.md)
+
+PG91         = $(shell $(PG_CONFIG) --version | grep -qE " 8\\.| 9\\.0" && echo no || echo yes)
+
+ifeq ($(PG91),yes)
+all: sql/$(EXTENSION)--$(EXTVERSION).sql
+sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
+	cp $< $@
+
+DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
+EXTRA_CLEAN = sql/$(EXTENSION)--$(EXTVERSION).sql
+endif
 
-PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

server/doc/postpic.md

@@ -0,0 +1,53 @@
+PostPic: A PostgreSQL extension for image-processing
+====================================================
+
+PostPic is an extension for the open source PostgreSQL dbms that enables
+image processing inside the database, like PostGIS does for spatial data.
+It adds the new 'image' type to the SQL, and several functions to process
+images and to extract their attributes.
+
+Eg.
+
+      select * from images 
+               where date(the_img) > '2009-01-01'::date
+               and size(the_img) > 1600;
+
+Traditional relational clauses can be combined in queries with image-related
+ones, and basic image processing can be performed in SQL.
+
+
+Resources
+---------
+
+PostPic is hosted at [GitHub](https://github.com/drotiro/postpic), 
+there you can find all the code releases and the project 
+[Wiki](http://wiki.github.com/drotiro/postpic/>) 
+with detailed documentation about the project.
+
+
+Contents of this package
+------------------------
+
+This package contains the following:
+
+ * __server__: sources for the server extension
+ * __utils__: utilities for client-side loading of images, etc.
+ * __examples__: a sql script to create sample tables and functions
+
+
+Copyright and license
+---------------------
+
+PostPic is Copyright (C) 2010 Domenico Rotiroti.
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Lesser General Public License as
+    published by the Free Software Foundation, version 3 of the License.
+
+    This program 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 Lesser General Public License for more details.
+
+    A copy of the GNU Lesser General Public License is included in the
+    source distribution of this software.

server/postpic.control

@@ -0,0 +1,5 @@
+comment = 'PostPic is an extension for the open source PostgreSQL dbms that enables image processing inside the database.'
+default_version = '0.9.1'
+module_pathname = '$libdir/postpic'
+requires = 'plpgsql'
+schema = 'public'

server/sql/postpic--unpackaged--0.9.1.sql

@@ -0,0 +1,59 @@
+/* contrib/postpic/postpic--unpackaged--0.9.1.sql */
+
+-- complain if script is sourced in psql rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION postpic" to load this file. \quit
+
+-- image Type
+ALTER EXTENSION postpic ADD TYPE image;
+ALTER EXTENSION postpic ADD FUNCTION image_in(cstring);
+ALTER EXTENSION postpic ADD FUNCTION image_out(image);
+ALTER EXTENSION postpic ADD FUNCTION image_send(image);
+ALTER EXTENSION postpic ADD FUNCTION image_recv(internal);
+
+-- colorspace Type
+ALTER EXTENSION postpic ADD TYPE colorspace;
+
+-- color Type
+ALTER EXTENSION postpic ADD TYPE color;
+ALTER EXTENSION postpic ADD FUNCTION color_in(cstring);
+ALTER EXTENSION postpic ADD FUNCTION color_out(color);
+
+-- Create image functions
+ALTER EXTENSION postpic ADD FUNCTION image_new(INT, INT, color);
+ALTER EXTENSION postpic ADD FUNCTION image_from_large_object(oid);
+ALTER EXTENSION postpic ADD FUNCTION image_from_bytea(bytea);
+
+-- Image metadata functions
+ALTER EXTENSION postpic ADD FUNCTION width(image);
+ALTER EXTENSION postpic ADD FUNCTION height(image);
+ALTER EXTENSION postpic ADD FUNCTION date(image);
+ALTER EXTENSION postpic ADD FUNCTION f_number(image);
+ALTER EXTENSION postpic ADD FUNCTION exposure_time(image);
+ALTER EXTENSION postpic ADD FUNCTION iso(image);
+ALTER EXTENSION postpic ADD FUNCTION focal_length(image);
+ALTER EXTENSION postpic ADD FUNCTION colorspace(image);
+ALTER EXTENSION postpic ADD FUNCTION size(image);
+
+-- Image manipulation functions
+ALTER EXTENSION postpic ADD FUNCTION thumbnail(image, INT);
+ALTER EXTENSION postpic ADD FUNCTION square(image, INT);
+ALTER EXTENSION postpic ADD FUNCTION draw_text(image, VARCHAR);
+-- Image, text, x, y
+ALTER EXTENSION postpic ADD FUNCTION draw_text(image, VARCHAR, INT, INT);
+-- Image, text, x, y, font family, font size
+ALTER EXTENSION postpic ADD FUNCTION draw_text(image, VARCHAR, INT, INT, VARCHAR, INT);
+-- Image, text, x, y, font family, font size, color
+ALTER EXTENSION postpic ADD FUNCTION draw_text(image, VARCHAR, INT, INT, VARCHAR, INT, color);
+ALTER EXTENSION postpic ADD FUNCTION draw_rect(image, BOX, color);
+ALTER EXTENSION postpic ADD FUNCTION resize(image, INT, INT);
+ALTER EXTENSION postpic ADD FUNCTION crop(image, INT, INT, INT, INT);
+ALTER EXTENSION postpic ADD FUNCTION rotate(image, FLOAT4);
+ALTER EXTENSION postpic ADD FUNCTION rotate_left(image);
+ALTER EXTENSION postpic ADD FUNCTION rotate_right(image);
+ALTER EXTENSION postpic ADD FUNCTION index (image[], VARCHAR, INT);
+
+-- Postpic information
+ALTER EXTENSION postpic ADD FUNCTION postpic_version();
+ALTER EXTENSION postpic ADD FUNCTION postpic_version_release();
+ALTER EXTENSION postpic ADD FUNCTION postpic_version_major();
+ALTER EXTENSION postpic ADD FUNCTION postpic_version_minor();

server/postpic.sql server/sql/postpic.sqlserver/postpic.sql renamed to server/sql/postpic.sql

@@ -1,7 +1,6 @@
 /*
  * Definition of our basic type: image
  */
-DROP TYPE image CASCADE;
 CREATE TYPE image; -- shell type
 
 CREATE FUNCTION image_in ( cstring )
@@ -62,11 +61,6 @@ CREATE TYPE color (
 	internallength = 8
 );
 
-/*
- * Make sure plpgsql is in
- */
-CREATE LANGUAGE plpgsql;
-
 CREATE FUNCTION image_new( INT, INT, color )
 	RETURNS image
 	AS '$libdir/postpic'