- Timestamp:
- Mar 17, 2009, 12:07:42 PM (17 years ago)
- Location:
- branches/cnb_branches/cnb_branch_20090301/psModules
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
src/config/pmConfigCamera.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/cnb_branches/cnb_branch_20090301/psModules
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/cnb_branches/cnb_branch_20090215/psModules merged eligible /trunk/psModules merged eligible /branches/cnb_branch_20090215/psModules 21495-22685 /branches/eam_branches/eam_branch_20090303/psModules 23158-23228
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
branches/cnb_branches/cnb_branch_20090301/psModules/src/config/pmConfigCamera.c
r22700 r23351 213 213 psStringAppend(&newName, "_%s-SKYCELL", name); 214 214 if (psMetadataLookup(oldCameras, newName)) { 215 psFree(newName); 215 216 return true; 216 217 } … … 469 470 psStringAppend(&newName, "_%s-%s", name, mosaicLevel == PM_FPA_LEVEL_CHIP ? "CHIP" : "FPA"); 470 471 if (psMetadataLookup(oldCameras, newName)) { 472 psFree(newName); 471 473 return true; 472 474 }
Note:
See TracChangeset
for help on using the changeset viewer.
