1 files changed, 35 insertions, 31 deletions

diff --git a/source/blender/imbuf/intern/dds/PixelFormat.h b/source/blender/imbuf/intern/dds/PixelFormat.h
index a9125c64121..5c1d8e981a6 100644
--- a/source/blender/imbuf/intern/dds/PixelFormat.h
+++ b/source/blender/imbuf/intern/dds/PixelFormat.h
@@ -25,28 +25,29 @@
  * Original license from NVIDIA follows.
  */
 
-// Copyright NVIDIA Corporation 2007 -- Ignacio Castano <icastano@nvidia.com>
-//
-// Permission is hereby granted, free of charge, to any person
-// obtaining a copy of this software and associated documentation
-// files (the "Software"), to deal in the Software without
-// restriction, including without limitation the rights to use,
-// copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the
-// Software is furnished to do so, subject to the following
-// conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-// OTHER DEALINGS IN THE SOFTWARE.
+/* Copyright NVIDIA Corporation 2007 -- Ignacio Castano <icastano@nvidia.com>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
 
 #pragma once
 
@@ -54,23 +55,23 @@
 
 namespace PixelFormat {
 
-// Convert component \a c having \a inbits to the returned value having \a outbits.
+/** Convert component \a c having \a inbits to the returned value having \a outbits. */
 inline uint convert(uint c, uint inbits, uint outbits)
 {
   if (inbits == 0) {
     return 0;
   }
   else if (inbits >= outbits) {
-    // truncate
+    /* truncate */
     return c >> (inbits - outbits);
   }
   else {
-    // bitexpand
+    /* bitexpand */
     return (c << (outbits - inbits)) | convert(c, inbits, outbits - inbits);
   }
 }
 
-// Get pixel component shift and size given its mask.
+/* Get pixel component shift and size given its mask. */
 inline void maskShiftAndSize(uint mask, uint *shift, uint *size)
 {
   if (!mask) {
@@ -94,11 +95,14 @@ inline void maskShiftAndSize(uint mask, uint *shift, uint *size)
 
 inline float quantizeCeil(float f, int inbits, int outbits)
 {
-  // uint i = f * (float(1 << inbits) - 1);
-  // i = convert(i, inbits, outbits);
-  // float result = float(i) / (float(1 << outbits) - 1);
-  // nvCheck(result >= f);
+#if 0
+  uint i = f * (float(1 << inbits) - 1);
+  i = convert(i, inbits, outbits);
+  float result = float(i) / (float(1 << outbits) - 1);
+  nvCheck(result >= f);
+#endif
   float result;
+
   int offset = 0;
   do {
     uint i = offset + uint(f * (float(1 << inbits) - 1));
@@ -124,4 +128,4 @@ inline float quantizeFloor(float f, int bits)
 }
 #endif
 
-}  // namespace PixelFormat
+} /* namespace PixelFormat */