Changeset 29515 for branches/eam_branches/ipp-20100823/pstamp/src/ppstamp.h

Timestamp:

Oct 21, 2010, 2:45:13 PM (16 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20100823/pstamp/src/ppstamp.h (modified) (1 diff)

branches/eam_branches/ipp-20100823/pstamp/src/ppstamp.h

@@ -18 +18 @@
 
 // Determine what type of camera, and initialise
-bool ppstampParseCamera(pmConfig *config);
+bool ppstampParseCamera(pmConfig *config, ppstampOptions *options);
 
 int ppstampMakeStamp(pmConfig *config, ppstampOptions *);