* Changed order of scaling and casting, to apply operation after cast.

* Fixed bug relating to complex scaling factor

Author: DylanMuir

MappedTensor.m

@@ -502,15 +502,29 @@ function delete(mtVar)
          end
 
          % - Reference the tensor data element
+         tfData = mt_read_data(mtVar.hShimFunc, mtVar.hRealContent, S, vnReferencedTensorSize, mtVar.strStorageClass, mtVar.nHeaderBytes, mtVar.bBigEndian, mtVar.hRepSumFunc, mtVar.hChunkLengthFunc);
+         
          if (mtVar.bIsComplex)
-            % - Get the real and complex parts
-            tfData = complex(mtVar.fRealFactor .* mt_read_data(mtVar.hShimFunc, mtVar.hRealContent, S, vnReferencedTensorSize, mtVar.strStorageClass, mtVar.nHeaderBytes, mtVar.bBigEndian, mtVar.hRepSumFunc, mtVar.hChunkLengthFunc), ...
-                             mtVar.fComplexFactor .* mt_read_data(mtVar.hShimFunc, mtVar.hCmplxContent, S, vnReferencedTensorSize, mtVar.strStorageClass, mtVar.nHeaderBytes, mtVar.bBigEndian, mtVar.hRepSumFunc, mtVar.hChunkLengthFunc));
-         else
-            % - Just return the real part
-            tfData = mtVar.fRealFactor .* mt_read_data(mtVar.hShimFunc, mtVar.hRealContent, S, vnReferencedTensorSize, mtVar.strStorageClass, mtVar.nHeaderBytes, mtVar.bBigEndian, mtVar.hRepSumFunc, mtVar.hChunkLengthFunc);
+            tfImagData = mt_read_data(mtVar.hShimFunc, mtVar.hCmplxContent, S, vnReferencedTensorSize, mtVar.strStorageClass, mtVar.nHeaderBytes, mtVar.bBigEndian, mtVar.hRepSumFunc, mtVar.hChunkLengthFunc);
+         end
+            
+         % - Cast data, if required
+         if (mtVar.bMustCast)
+            tfData = cast(tfData, mtVar.strClass);
+            
+            if (mtVar.bIsComplex)
+               tfImagData = cast(tfImagData, mtVar.strClass);
+            end
          end
 
+         % - Apply scaling factors
+         if (mtVar.bIsComplex)
+            tfData = complex(mtVar.fRealFactor .* tfData, ...
+                             mtVar.fComplexFactor .* tfImagData);
+         else
+            tfData = mtVar.fRealFactor .* tfData;
+         end
+                  
          % - Permute dimensions
          tfData = permute(tfData, mtVar.vnDimensionOrder);
 
@@ -523,11 +537,6 @@ function delete(mtVar)
             cnSize = num2cell(size(tfData));
             tfData = reshape(tfData, cnSize{1:nNumDims-1}, []);
          end
-         
-         % - Cast data, if required
-         if (mtVar.bMustCast)
-            tfData = cast(tfData, mtVar.strClass);
-         end
       end
 
       % subsasgn - METHOD Overloaded subsasgn
@@ -772,7 +781,7 @@ function delete(mtVar)
          mtVar.fRealFactor = mtVar.fRealFactor .* fScalar;
 
          if (mtVar.bIsComplex)
-            mtVar.fCmplxFactor = mtVar.fCmplxFactor .* fScalar;
+            mtVar.fComplexFactor = mtVar.fComplexFactor .* fScalar;
          end
       end