Changeset 956 for trunk/src/series/merge_proj.m

Timestamp:

Jun 22, 2016, 8:10:14 PM (8 years ago)

Author:

sommeria

Message:

various

File:

• trunk/src/series/merge_proj.m (modified) (3 diffs)

trunk/src/series/merge_proj.m

@@ -203 +203 @@
 if min(cell2mat(CheckImage))==1 && (~Param.CheckObject || strcmp(Param.ProjObject.Type,'plane'))
     FileExtOut='.png'; %image output (input and proj result = image)
-    for iview=1:NbView
-        BitDepth(iview)=FileInfo{iview}.BitDepth;
-    end
-    BitDepth=max(BitDepth);
 else
     FileExtOut='.nc'; %netcdf output
@@ -357 +353 @@
     %% recording the merged field
     if strcmp(FileExtOut,'.png')    %output as image
-        if BitDepth==8
-            imwrite(uint8(MergeData.A),OutputFile,'BitDepth',8)
-        else
-            imwrite(uint16(MergeData.A),OutputFile,'BitDepth',16)
-        end
         if index==1
+            if strcmp(class(MergeData.A),'uint8')
+            BitDepth=8;
+            else
+              BitDepth=16;  
+            end
             %write xml calibration file, using the first file
             siz=size(MergeData.A);
@@ -391 +387 @@
             save(t,[fileparts(OutputFile) '.xml'])
         end
-        
+        if BitDepth==8
+            imwrite(uint8(MergeData.A),OutputFile,'BitDepth',8)
+        else
+            imwrite(uint16(MergeData.A),OutputFile,'BitDepth',16)
+        end
     else   %output as netcdf files
         MergeData.ListGlobalAttribute={'Conventions','Project','InputFile_1','InputFile_end','NbCoord','NbDim'};