From 9c9feac1e811c1718a97a85e3d9031fa27fbe250 Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 22 Jun 2001 19:29:59 +0000
Subject: [PATCH] Tweaks to work with the .stg / .btg naming convention.

---
 src/Prep/Photo/Makefile.am | 8 ++++++--
 src/Prep/Photo/chop.pl     | 2 +-
 src/Prep/Photo/photo.cxx   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/Prep/Photo/Makefile.am b/src/Prep/Photo/Makefile.am
index 8812ffb7..ac269084 100644
--- a/src/Prep/Photo/Makefile.am
+++ b/src/Prep/Photo/Makefile.am
@@ -23,9 +23,9 @@
 #---------------------------------------------------------------------------
 
 
-EXTRA_DIST = chop.pl
+EXTRA_DIST = chop.pl trans.pl
 
-bin_PROGRAMS = photo
+bin_PROGRAMS = photo wgs84offset
 
 photo_SOURCES = photo.cxx
 
@@ -39,6 +39,10 @@ photo_LDADD = \
 	-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \
 	$(base_LIBS)
 
+wgs84offset_SOURCES = wgs84offset.cxx
+
+wgs84offset_LDADD = -lsgmath -lsgdebug
+
 INCLUDES += \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
diff --git a/src/Prep/Photo/chop.pl b/src/Prep/Photo/chop.pl
index 3e2f9395..d84a57ca 100755
--- a/src/Prep/Photo/chop.pl
+++ b/src/Prep/Photo/chop.pl
@@ -35,7 +35,7 @@ for ( $j = 0; $j < $ydiv; $j++ ) {
         $outputsgi = sprintf("$basename%X%X.sgi", $i, $j);
         $outputrgb = sprintf("$basename%X%X.rgb", $i, $j);
         printf "pnmcut $x $y $dx $dy $basename.pnm | pnmscale -xysize $res $res > $outputpnm\n";
-        `pnmcut $x $y $dx $dy $basename.pnm | pnmscale -xysize $res $res > $outputpnm`;
+        `pnmcut $x $y $dx $dy $basename.pnm | pnmscale -xsize $res -ysize $res > $outputpnm`;
         `convert $outputpnm $outputsgi`;
         unlink($outputpnm);
         rename($outputsgi, $outputrgb);
diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx
index 084abd4f..cbd4e457 100644
--- a/src/Prep/Photo/photo.cxx
+++ b/src/Prep/Photo/photo.cxx
@@ -288,7 +288,7 @@ int main( int argc, char **argv ) {
 
     // write the object
     string objpath = root + "/PhotoObj";
-    string name = image;
+    string name = image + ".btg";
 
     bool result = obj.write_bin( objpath, name, b );
     if ( !result ) {