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 ) {