Browse Source

*** empty log message ***

David Rose 24 years ago
parent
commit
5a89ee2ba8
2 changed files with 45 additions and 45 deletions
  1. 5 5
      pandaapp/src/stitchbase/stitchImage.cxx
  2. 40 40
      pandaapp/src/stitchbase/stitchParser.h

+ 5 - 5
pandaapp/src/stitchbase/stitchImage.cxx

@@ -451,14 +451,14 @@ resize_data() {
     return;
     return;
   }
   }
 
 
-  PNMImage *small = 
+  PNMImage *reduced = 
     new PNMImage(_orig_size_pixels[0], _orig_size_pixels[1], 
     new PNMImage(_orig_size_pixels[0], _orig_size_pixels[1], 
                  _data->get_color_type());
                  _data->get_color_type());
 
 
-  cerr << "Filtering to " << small->get_x_size() << " by " 
-       << small->get_y_size() << "\n";
+  cerr << "Filtering to " << reduced->get_x_size() << " by " 
+       << reduced->get_y_size() << "\n";
 
 
-  small->box_filter_from(1.0, *_data);
+  reduced->box_filter_from(1.0, *_data);
   delete _data;
   delete _data;
-  _data = small;
+  _data = reduced;
 }
 }

+ 40 - 40
pandaapp/src/stitchbase/stitchParser.h

@@ -1,43 +1,43 @@
-#define	NUMBER	257
-#define	NUMBER_FEET	258
-#define	NUMBER_INCHES	259
-#define	IDENTIFIER	260
-#define	STRING	261
-#define	KW_DEFINE	262
-#define	KW_LENS	263
-#define	KW_INPUT_IMAGE	264
-#define	KW_OUTPUT_IMAGE	265
-#define	KW_PERSPECTIVE	266
-#define	KW_FISHEYE	267
-#define	KW_CYLINDRICAL	268
-#define	KW_PSPHERE	269
-#define	KW_FOCAL_LENGTH	270
-#define	KW_FOV	271
-#define	KW_SINGULARITY_TOLERANCE	272
-#define	KW_RESOLUTION	273
-#define	KW_FILENAME	274
-#define	KW_POINT	275
-#define	KW_SHOW_POINTS	276
-#define	KW_IMAGE_SIZE	277
-#define	KW_FILM_SIZE	278
-#define	KW_FILM_OFFSET	279
-#define	KW_GRID	280
-#define	KW_UNTEXTURED_COLOR	281
-#define	KW_HPR	282
-#define	KW_POS	283
-#define	KW_RADIUS	284
-#define	KW_ANGLE	285
-#define	KW_HEIGHT	286
-#define	KW_LAYERS	287
-#define	KW_STITCH	288
-#define	KW_SCREEN	289
-#define	KW_POINTS	290
-#define	KW_USING	291
-#define	KW_IN	292
-#define	KW_MM	293
-#define	KW_FT	294
-#define	KW_CM	295
-#define	KW_P	296
+#define	NUMBER	258
+#define	NUMBER_FEET	259
+#define	NUMBER_INCHES	260
+#define	IDENTIFIER	261
+#define	STRING	262
+#define	KW_DEFINE	263
+#define	KW_LENS	264
+#define	KW_INPUT_IMAGE	265
+#define	KW_OUTPUT_IMAGE	266
+#define	KW_PERSPECTIVE	267
+#define	KW_FISHEYE	268
+#define	KW_CYLINDRICAL	269
+#define	KW_PSPHERE	270
+#define	KW_FOCAL_LENGTH	271
+#define	KW_FOV	272
+#define	KW_SINGULARITY_TOLERANCE	273
+#define	KW_RESOLUTION	274
+#define	KW_FILENAME	275
+#define	KW_POINT	276
+#define	KW_SHOW_POINTS	277
+#define	KW_IMAGE_SIZE	278
+#define	KW_FILM_SIZE	279
+#define	KW_FILM_OFFSET	280
+#define	KW_GRID	281
+#define	KW_UNTEXTURED_COLOR	282
+#define	KW_HPR	283
+#define	KW_POS	284
+#define	KW_RADIUS	285
+#define	KW_ANGLE	286
+#define	KW_HEIGHT	287
+#define	KW_LAYERS	288
+#define	KW_STITCH	289
+#define	KW_SCREEN	290
+#define	KW_POINTS	291
+#define	KW_USING	292
+#define	KW_IN	293
+#define	KW_MM	294
+#define	KW_FT	295
+#define	KW_CM	296
+#define	KW_P	297
 
 
 
 
 extern YYSTYPE stitchyylval;
 extern YYSTYPE stitchyylval;