fly/terragear
1
0
Fork 0
Code Activity

Tweaks to work with the .stg / .btg naming convention.

Browse source
This commit is contained in:
curt 2001-06-22 19:29:59 +00:00
parent 5023d2e581
commit 9c9feac1e8
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Prep/Photo/Makefile.am
View file

@ -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 photo_SOURCES = photo.cxx
@ -39,6 +39,10 @@ photo_LDADD = \
-lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \ -lsgbucket -lsgdebug -lsgio -lsgmath -lsgmisc -lz -lgpc \
$(base_LIBS) $(base_LIBS)
wgs84offset_SOURCES = wgs84offset.cxx
wgs84offset_LDADD = -lsgmath -lsgdebug
INCLUDES += \ INCLUDES += \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/src \ -I$(top_srcdir)/src \

2
src/Prep/Photo/chop.pl
View file

@ -35,7 +35,7 @@ for ( $j = 0; $j < $ydiv; $j++ ) {
$outputsgi = sprintf("$basename%X%X.sgi", $i, $j); $outputsgi = sprintf("$basename%X%X.sgi", $i, $j);
$outputrgb = sprintf("$basename%X%X.rgb", $i, $j); $outputrgb = sprintf("$basename%X%X.rgb", $i, $j);
printf "pnmcut $x $y $dx $dy $basename.pnm | pnmscale -xysize $res $res > $outputpnm\n"; 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`; `convert $outputpnm $outputsgi`;
unlink($outputpnm); unlink($outputpnm);
rename($outputsgi, $outputrgb); rename($outputsgi, $outputrgb);

2
src/Prep/Photo/photo.cxx
View file

@ -288,7 +288,7 @@ int main( int argc, char **argv ) {
// write the object // write the object
string objpath = root + "/PhotoObj"; string objpath = root + "/PhotoObj";
string name = image; string name = image + ".btg";
bool result = obj.write_bin( objpath, name, b ); bool result = obj.write_bin( objpath, name, b );
if ( !result ) { if ( !result ) {