Merge lp:~mc-return/nux/nux.merge-reduce-the-scope-of-various-variables into lp:nux

[MC Return]

Reduced the scope of various variables.

[Brandon Schaefer (brandontschaefer)]

Looks good to me.

review: Approve

[Tim Penhey (thumper)]

On 06/12/12 15:11, <email address hidden> wrote:
> The proposal to merge lp:~mc-return/nux/nux.merge-reduce-the-scope-of-various-variables into lp:nux has been updated.
>
> Status: Approved => Merged
>
> For more details, see:
> https://code.launchpad.net/~mc-return/nux/nux.merge-reduce-the-scope-of-various-variables/+merge/134787
>

I don't suppose you are interested in amending those merges to change

bool foo = (a < b) ? true : false;

to just bee

bool foo = a < b;

?

[Brandon Schaefer (brandontschaefer)]

Geez...I didn't notice how bad that was... Ill push a branch with those changes tomorrow.

[MC Return (mc-return)]

> I don't suppose you are interested in amending those merges to change
>
> bool foo = (a < b) ? true : false;
>
> to just bee
>
> bool foo = a < b;

I did not make such changes.
I just changed the local bools, which where initialized with false, then not used, and after the if statement reassigned a new value, without the old one having been used.
So I removed the initial, unused initialization with false and only declared and initialized them with the correct value later...

[Brandon Schaefer (brandontschaefer)]

@MC

Yes, what Tim wants is to change:
bool larger_width = (pre_geo.width < post_geo.width) ? true : false;

to:
bool larger_width = pre_geo.width < post_geo.width;

... does that make sense how bad that looks?

[MC Return (mc-return)]

@Brandon:

Ah - yes, makes sense.
I am not sure if it looks better, but it produces the same results - so, if that version is faster we should change it, otherwise probably not...

=== modified file 'Nux/HLayout.cpp'
--- Nux/HLayout.cpp	2012-10-10 22:46:50 +0000
+++ Nux/HLayout.cpp	2012-11-17 22:04:21 +0000
@@ -356,10 +356,6 @@
         if (!(*it)->IsVisible())
           continue;
 
-        bool smaller_height = false;
-        bool larger_height  = false;
-        bool larger_width   = false;
-        bool smaller_width  = false;
         int ret = 0;
 
         if (((*it)->IsLayout()  || (*it)->IsView()) /*&& ((*it)->IsLayoutDone() == false)*/ /*&& ((*it)->GetScaleFactor() != 0)*/)
@@ -368,10 +364,10 @@
           ret = (*it)->ComputeContentSize();
           Geometry post_geo = (*it)->GetGeometry();
 
-          larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
-          smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
-          larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
-          smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
+          bool larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
+          bool smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
+          bool larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
+          bool smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
 
           if ((larger_width || smaller_width) && ((*it)->IsLayoutDone() == false))
           {

=== modified file 'Nux/VLayout.cpp'
--- Nux/VLayout.cpp	2012-10-10 22:46:50 +0000
+++ Nux/VLayout.cpp	2012-11-17 22:04:21 +0000
@@ -363,10 +363,6 @@
         if (!(*it)->IsVisible())
           continue;
 
-        bool larger_height  = false;
-        bool smaller_height = false;
-        bool smaller_width  = false;
-        bool larger_width   = false;
         int ret = 0;
         
         if (((*it)->IsLayout() || (*it)->IsView()) /*&& ((*it)->IsLayoutDone() == false)*/ /*&& ((*it)->GetScaleFactor() != 0)*/)
@@ -375,10 +371,10 @@
           ret = (*it)->ComputeContentSize();
           Geometry post_geo = (*it)->GetGeometry();
 
-          larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
-          smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
-          larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
-          smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
+          bool larger_width    = (pre_geo.width < post_geo.width)    ? true : false;
+          bool smaller_width   = (pre_geo.width > post_geo.width)    ? true : false;
+          bool larger_height   = (pre_geo.height < post_geo.height)  ? true : false;
+          bool smaller_height  = (pre_geo.height > post_geo.height)  ? true : false;
 
           if ((larger_height || smaller_height) && ((*it)->IsLayoutDone() == false))
           {

=== modified file 'NuxCore/LoggingWriter.cpp'
--- NuxCore/LoggingWriter.cpp	2011-08-22 01:12:28 +0000
+++ NuxCore/LoggingWriter.cpp	2012-11-17 22:04:21 +0000
@@ -85,12 +85,13 @@
   tm local_time;
 
 #if defined(NUX_OS_WINDOWS)
-  static const char* invalid_time_stamp = "invalid_time_stamp";
-
   if (localtime_s(&local_time, &timestamp) == 0)
     std::strftime(buffer, buf_size, format, &local_time);
   else
+  {
+    static const char* invalid_time_stamp = "invalid_time_stamp";
     memcpy_s(buffer, sizeof(buffer), invalid_time_stamp, strnlen(invalid_time_stamp, 30));
+  }
 #else
   std::strftime(buffer, buf_size, format, ::localtime_r(&timestamp, &local_time));
 #endif

=== modified file 'NuxGraphics/IOpenGLBaseTexture.cpp'
--- NuxGraphics/IOpenGLBaseTexture.cpp	2012-09-26 06:44:12 +0000
+++ NuxGraphics/IOpenGLBaseTexture.cpp	2012-11-17 22:04:21 +0000
@@ -324,8 +324,6 @@
     GLint unpack_alignment = GPixelFormats[pTexture->_PixelFormat].RowMemoryAlignment;
     unsigned int halfUnpack = Log2(unpack_alignment);
 
-    unsigned int BytePerPixel = 0;
-
     pDesc->PixelFormat = pTexture->_PixelFormat;
 
     if ( /*pTexture->_Format  == GL_COMPRESSED_RGB_S3TC_DXT1_EXT ||*/
@@ -388,13 +386,13 @@
     }
     else
     {
-      pDesc->Width            = Max<unsigned int> (1, pTexture->_Width >> Level);
-      pDesc->Height           = Max<unsigned int> (1, pTexture->_Height >> Level);
-      pDesc->WidthInBlocks    = pDesc->Width;
-      pDesc->HeightInBlocks   = pDesc->Height;
-      BytePerPixel            = GPixelFormats[pTexture->_PixelFormat].BlockBytes;
-      pDesc->BitsPerPixel     = BytePerPixel * 8;
-      pDesc->BytesPerBlock    = BytePerPixel; // a block is a 1x1 pixel ie. 1 pixel.
+      pDesc->Width              = Max<unsigned int> (1, pTexture->_Width >> Level);
+      pDesc->Height             = Max<unsigned int> (1, pTexture->_Height >> Level);
+      pDesc->WidthInBlocks      = pDesc->Width;
+      pDesc->HeightInBlocks     = pDesc->Height;
+      unsigned int BytePerPixel = GPixelFormats[pTexture->_PixelFormat].BlockBytes;
+      pDesc->BitsPerPixel       = BytePerPixel * 8;
+      pDesc->BytesPerBlock      = BytePerPixel; // a block is a 1x1 pixel ie. 1 pixel.
       pDesc->RowPitch = (((pDesc->Width * BytePerPixel + (unpack_alignment - 1)) >> (halfUnpack)) << (halfUnpack));
       pDesc->SlicePitch = (((pDesc->Width * BytePerPixel + (unpack_alignment - 1)) >> (halfUnpack)) << (halfUnpack)) * pDesc->Height;
     }

=== modified file 'NuxGraphics/IOpenGLGLSLShader.cpp'
--- NuxGraphics/IOpenGLGLSLShader.cpp	2012-11-04 10:45:15 +0000
+++ NuxGraphics/IOpenGLGLSLShader.cpp	2012-11-17 22:04:21 +0000
@@ -45,16 +45,14 @@
 
   bool ExtractShaderString3(const std::string &ShaderToken, const std::string &ShaderSource, std::string &RetSource, std::string ShaderPreprocessorDefines)
   {
-    size_t lineStart = 0;
-    size_t lineCount = 1;
-    bool startTokenFound = false;
-    size_t shaderStringStart = 0;
-    size_t shaderStartLine   = 1;
-
-
     //Loop for all characters in the string
     if (ShaderToken != "")
     {
+      size_t lineStart = 0;
+      size_t lineCount = 1;
+      bool startTokenFound = false;
+      size_t shaderStringStart = 0;
+      size_t shaderStartLine   = 1;
       size_t i;
 
       for (i = 0; i < ShaderSource.length(); i++)