IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 40483 for branches/czw_branch/20170908/pstamp/src/pstamp.h

Timestamp:

Jun 27, 2018, 3:31:55 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908

Files:

: 2 edited

. (modified) (1 prop)
pstamp/src/pstamp.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/czw_branch/20170908

Property svn:mergeinfo changed

/trunk (added)

merged: 40130-40136,40138,40147-40148,40150-40154,40160-40162,40165-40167,40178,40180,40182-40187,40201,40203,40208,40215,40218,40221-40222,40224-40227,40232-40233,40240,40250-40252,40261,40264,40268-40284,40287-40288,40290-40291,40294-40348,40351,40353-40354,40356-40366,40370-40371,40373-40374,40376-40378,40382-40389,40392-40393,40395,40397-40398,40400-40416,40418-40421,40423-40441,40443-40445,40447-40455,40459-40474

branches/czw_branch/20170908/pstamp/src/pstamp.h

-              r36811
+              r40483
 #define PSTAMP_SELECT_UNCONV        2048
 #define PSTAMP_RESTORE_BACKGROUND   4096
+// unused                           8192
+// MEH -- previously unused                           8192
+#define PSTAMP_MULTI_OVERLAP_IMAGE  8192
 #define PSTAMP_USE_IMFILE_ID        16384

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: