From 0e52247373acad9572440624c41846efd3a573d1 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 27 Oct 2006 22:18:48 +0200 Subject: add initial ImageMetaData classes --- src/ImageMetaData.H | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 src/ImageMetaData.H (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H new file mode 100644 index 0000000..79495f4 --- /dev/null +++ b/src/ImageMetaData.H @@ -0,0 +1,56 @@ +// +// Copyright 2006 by Johannes Hofmann +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU 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 IMAGE_META_DATA_H +#define IMAGE_META_DATA_H + +class ImageMetaData { + protected: + double longitude; + double latitude; + double height; + double direction; + double nick; + double tilt; + double focallength_sensor_ratio; + int projection_type; + + public: + virtual int load_image(const char *name); + virtual int save_image(const char *name); + + double get_longitude(); + double get_latitude(); + double get_height(); + double get_direction(); + double get_nick(); + double get_tilt(); + double get_focallength_sensor_ratio(); + int get_projection_type(); + + void set_longitude(double v); + void set_latitude(double v); + void set_height(double v); + void set_direction(double v); + void set_nick(double v); + void set_tilt(double v); + void set_focallength_sensor_ratio(double v); + int set_projection_type(int v); +}; +#endif -- cgit v1.2.3 From 8e2ebc4de19e6956549413a599f6e27daa498303 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Fri, 27 Oct 2006 23:24:13 +0200 Subject: implement ImageMetaData classes --- src/ImageMetaData.H | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 79495f4..3349cab 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -32,8 +32,10 @@ class ImageMetaData { int projection_type; public: - virtual int load_image(const char *name); - virtual int save_image(const char *name); + ImageMetaData(); + + virtual int load_image(char *name); + virtual int save_image(char *name); double get_longitude(); double get_latitude(); -- cgit v1.2.3 From 3863aa643f604f17b79684093fd34e7a67b093fa Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sat, 28 Oct 2006 00:03:29 +0200 Subject: fix ImageMetaData classes --- src/ImageMetaData.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 3349cab..1318e10 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -53,6 +53,6 @@ class ImageMetaData { void set_nick(double v); void set_tilt(double v); void set_focallength_sensor_ratio(double v); - int set_projection_type(int v); + void set_projection_type(int v); }; #endif -- cgit v1.2.3 From 20286c5a434580d38dc0a85981503d6310b9e55a Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Sat, 28 Oct 2006 00:36:32 +0200 Subject: move Jpeg header writing to JpgcomImageMetaData class update NEWS --- src/ImageMetaData.H | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 1318e10..637b758 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -35,7 +35,7 @@ class ImageMetaData { ImageMetaData(); virtual int load_image(char *name); - virtual int save_image(char *name); + virtual int save_image(char *in_img, char *out_img); double get_longitude(); double get_latitude(); -- cgit v1.2.3 From da5192170bb7ed19a8eadbc8ac393b0fa222c7df Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 18:18:57 +0100 Subject: consolidate ExifImageMetaData and src/JpgcomImageMetaData into ImageMetaData --- src/ImageMetaData.H | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 637b758..442aaef 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -21,7 +21,7 @@ #define IMAGE_META_DATA_H class ImageMetaData { - protected: + private: double longitude; double latitude; double height; @@ -31,11 +31,15 @@ class ImageMetaData { double focallength_sensor_ratio; int projection_type; + int load_image_jpgcom(char *name); + int save_image_jpgcom(char *in_img, char *out_img); + int load_image_exif(char *name); + public: ImageMetaData(); - virtual int load_image(char *name); - virtual int save_image(char *in_img, char *out_img); + int load_image(char *name); + int save_image(char *in_img, char *out_img); double get_longitude(); double get_latitude(); -- cgit v1.2.3 From 19bec8bde89fc08f6497a346b2121bcd96d1f528 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 18:37:27 +0100 Subject: fix problem with compatibility code --- src/ImageMetaData.H | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 442aaef..7116d98 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -29,6 +29,7 @@ class ImageMetaData { double nick; double tilt; double focallength_sensor_ratio; + double scale; int projection_type; int load_image_jpgcom(char *name); @@ -38,7 +39,7 @@ class ImageMetaData { public: ImageMetaData(); - int load_image(char *name); + int load_image(char *name, int img_width); int save_image(char *in_img, char *out_img); double get_longitude(); -- cgit v1.2.3 From 4188cb198bec8a83cfeb893608af2bd39d515449 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 19:21:16 +0100 Subject: scale -> focal_length_35mm --- src/ImageMetaData.H | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 7116d98..48d5043 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -28,7 +28,7 @@ class ImageMetaData { double direction; double nick; double tilt; - double focallength_sensor_ratio; + double focal_length_35mm; double scale; int projection_type; @@ -48,7 +48,7 @@ class ImageMetaData { double get_direction(); double get_nick(); double get_tilt(); - double get_focallength_sensor_ratio(); + double get_focal_length_35mm(); int get_projection_type(); void set_longitude(double v); @@ -57,7 +57,7 @@ class ImageMetaData { void set_direction(double v); void set_nick(double v); void set_tilt(double v); - void set_focallength_sensor_ratio(double v); + void set_focal_length_35mm(double v); void set_projection_type(int v); }; #endif -- cgit v1.2.3 From 364fadcbea5f37799bb42e663106e3a007746984 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:45:53 +0100 Subject: strip copyright --- src/ImageMetaData.H | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 48d5043..6cb16fe 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -1,21 +1,3 @@ -// -// Copyright 2006 by Johannes Hofmann -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU 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 IMAGE_META_DATA_H #define IMAGE_META_DATA_H -- cgit v1.2.3 From 6c50749f40e50a4b6a260a262b40035bfe83fd76 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Mon, 30 Oct 2006 20:49:30 +0100 Subject: add simplified copyright --- src/ImageMetaData.H | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ImageMetaData.H') diff --git a/src/ImageMetaData.H b/src/ImageMetaData.H index 6cb16fe..5796964 100644 --- a/src/ImageMetaData.H +++ b/src/ImageMetaData.H @@ -1,3 +1,8 @@ +// +// Copyright 2006 Johannes Hofmann +// +// This software may be used and distributed according to the terms +// of the GNU General Public License, incorporated herein by reference. #ifndef IMAGE_META_DATA_H #define IMAGE_META_DATA_H -- cgit v1.2.3