variable name error fix

variable name error fix

--- Working/CameraCalibration/CameraCalibration.cpp
+++ Working/CameraCalibration/CameraCalibration.cpp
@@ -106,7 +106,7 @@
   picamctrl.set(V4L2_CID_ISO_SENSITIVITY_AUTO, 0);

   // Initialize exposure, iso values
-  picamctrl.set(V4L2_CID_EXPOSURE_ABSOLUTE, BRIGHT_EXPOSURE);
+  picamctrl.set(V4L2_CID_EXPOSURE_ABSOLUTE, EXPOSURE);
   picamctrl.set(V4L2_CID_ISO_SENSITIVITY, ISO_VALUE);

   // Set capture camera size (resolution)


- fixed box corner bug with colored background

git-svn-id: 0eeae5948e6d2812090bd4f7305b0670ff9fe118@72 17a06da3-8c20-fa79-550f-e9588e724b77

--- Classes/mirc/dcxbox.cpp
+++ Classes/mirc/dcxbox.cpp
@@ -1100,126 +1100,130 @@
       }
       break;

-    case WM_PAINT:
-      {
-        PAINTSTRUCT ps;
-        HDC hdc;
-
-        hdc = BeginPaint( this->m_Hwnd, &ps );
-
-        RECT rc, rcText, rcText2;
-        GetClientRect( this->m_Hwnd, &rc );
-
-        int n = GetWindowTextLength( this->m_Hwnd );
-
-        HBRUSH hBrush, hOldBrush;
-        HPEN hOldPen;
-
-        if ( this->m_hBackBrush != NULL )
-          hBrush = this->m_hBackBrush;
-        else
-          hBrush = GetSysColorBrush( COLOR_3DFACE );
-
-        if ( this->m_clrBackText != -1 )
-          hOldPen = (HPEN) SelectObject( hdc, CreatePen( PS_SOLID, 1, this->m_clrBackText ) );
-
-        RECT rc2;
-        CopyRect( &rc2, &rc );
-        rc2.top = rc2.bottom - 3;
-        FillRect( hdc, &rc2, hBrush );
-
-        hOldBrush = (HBRUSH) SelectObject( hdc, hBrush );
-
-        if ( n == 0 ) {
-
-          if ( this->m_iBoxStyles & BOXS_SQUARED )
-            Rectangle( hdc, rc.left, rc.top, rc.right, rc.bottom );
-          else
-            RoundRect( hdc, rc.left, rc.top, rc.right, rc.bottom, 5, 5 );
-        }
-        else {
-
-          HFONT oldFont;
-          if ( this->m_hFont != NULL )
-            oldFont = (HFONT) SelectObject( hdc, this->m_hFont );
-
-          char * text = new char[n+2];
-          GetWindowText( this->m_Hwnd, text, n+1 );
-          DrawText( hdc, text, n, &rcText, DT_CALCRECT );
-
-          int w = rcText.right - rcText.left;
-          int h = rcText.bottom - rcText.top;
-
-          if ( this->m_iBoxStyles & BOXS_BOTTOM ) {
-
-            RECT rcfill;
-            CopyRect( &rcfill, &rc );
-            rcfill.top = rc.bottom - h;
-            FillRect( hdc, &rcfill, hBrush );
-            if ( this->m_iBoxStyles & BOXS_SQUARED )
-              Rectangle( hdc, rc.left, rc.top, rc.right, rc.bottom - h / 2 );
-            else
-              RoundRect( hdc, rc.left, rc.top, rc.right, rc.bottom - h / 2, 5, 5 );
-            rcText.top = rc.bottom - h;
-          }
-          else {
-
-            RECT rcfill;
-            CopyRect( &rcfill, &rc );
-            rcfill.bottom = rc.top + h;
-            FillRect( hdc, &rcfill, hBrush );
-            if ( this->m_iBoxStyles & BOXS_SQUARED )
-              Rectangle( hdc, rc.left, rc.top + h / 2, rc.right, rc.bottom );
-            else
-              RoundRect( hdc, rc.left, rc.top + h / 2, rc.right, rc.bottom, 5, 5 );
-            rcText.top = rc.top;
-          }
-
-          rcText.bottom = rcText.top + h;
-
-          int bw = rc.right - rc.left - 2*DCX_BOXTEXTSPACING;
-          if ( w > bw ) {
-
-            rcText.left = rc.left + DCX_BOXTEXTSPACING;
-            rcText.right = rc.right - DCX_BOXTEXTSPACING;
-          }
-          else {
-
-            if ( this->m_iBoxStyles & BOXS_RIGHT )
-              rcText.left = rc.right - DCX_BOXTEXTSPACING - w;
-            else if ( this->m_iBoxStyles & BOXS_CENTER )
-              rcText.left = (rc.left + rc.right - w) / 2;
-            else
-              rcText.left = rc.left + DCX_BOXTEXTSPACING;
-
-            rcText.right = rcText.left + w;
-          }
-
-          CopyRect( &rcText2, &rcText );
-          InflateRect( &rcText2, 3, 0 );
-          FillRect( hdc, &rcText2, hBrush );
-          SetBkMode( hdc, TRANSPARENT );
-          if ( this->m_clrText != -1 )
-            SetTextColor( hdc, this->m_clrText );
-
-          DrawText( hdc, text, n, &rcText, DT_LEFT | DT_END_ELLIPSIS );
-
-          SelectObject( hdc, hOldBrush );
-          if ( this->m_clrText != -1 )
-            SelectObject( hdc, hOldPen );
-
-          if ( this->m_hFont != NULL )
-            SelectObject( hdc, oldFont );
-
-          EndPaint( this->m_Hwnd, &ps );
-          delete []text;
-        }
-
-        bParsed = TRUE;
-        return 0L;
-      }
-      break;
-
+	case WM_PAINT:
+	{
+		PAINTSTRUCT ps;
+		HDC hdc = BeginPaint(this->m_Hwnd, &ps);
+		RECT rc, rc2, rcText, rcText2;
+		int n = GetWindowTextLength(this->m_Hwnd);
+
+		HBRUSH hBrush, hOldBrush;
+		HPEN hOldPen;
+
+		GetClientRect(this->m_Hwnd, &rc);
+		CopyRect(&rc2, &rc);
+
+		// set up brush colors
+		if (this->m_hBackBrush != NULL)
+			hBrush = this->m_hBackBrush;
+		else
+			hBrush = GetSysColorBrush(COLOR_3DFACE);
+
+		if (this->m_clrBackText != -1)
+			hOldPen = (HPEN) SelectObject(hdc, CreatePen(PS_SOLID, 1, this->m_clrBackText));
+
+		// paint the background
+		//rc2.top = rc2.bottom - 3;
+		FillRect( hdc, &rc2, hBrush );
+		hOldBrush = (HBRUSH) SelectObject( hdc, hBrush );
+
+		// if no text, just draw box
+		if (n == 0) {
+			if (this->m_iBoxStyles & BOXS_SQUARED)
+				Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom);
+			else
+				RoundRect(hdc, rc.left, rc.top, rc.right, rc.bottom, 5, 5);
+		}
+		// if there is text
+		else {
+			HFONT oldFont;
+
+			if (this->m_hFont != NULL)
+				oldFont = (HFONT) SelectObject(hdc, this->m_hFont);
+
+			char *text = new char[n +2];
+			GetWindowText(this->m_Hwnd, text, n +1);
+			DrawText(hdc, text, n, &rcText, DT_CALCRECT);
+
+			int w = rcText.right - rcText.left;
+			int h = rcText.bottom - rcText.top;
+
+			// text at bottom?
+			if (this->m_iBoxStyles & BOXS_BOTTOM) {
+				RECT rcfill;
+
+				CopyRect(&rcfill, &rc);
+				rcfill.top = rc.bottom - h;
+				FillRect(hdc, &rcfill, hBrush);
+
+				if (this->m_iBoxStyles & BOXS_SQUARED)
+					Rectangle(hdc, rc.left, rc.top, rc.right, rc.bottom - h /2);
+				else
+					RoundRect(hdc, rc.left, rc.top, rc.right, rc.bottom - h /2, 5, 5);
+
+				rcText.top = rc.bottom - h;
+			}
+			// text at top
+			else {
+				RECT rcfill;
+
+				CopyRect(&rcfill, &rc);
+				rcfill.bottom = rc.top + h;
+				FillRect(hdc, &rcfill, hBrush);
+
+				if (this->m_iBoxStyles & BOXS_SQUARED)
+					Rectangle(hdc, rc.left, rc.top + h /2, rc.right, rc.bottom);
+				else
+					RoundRect(hdc, rc.left, rc.top + h /2, rc.right, rc.bottom, 5, 5);
+
+				rcText.top = rc.top;
+			}
+
+			rcText.bottom = rcText.top + h;
+
+			int bw = rc.right - rc.left - (2 * DCX_BOXTEXTSPACING);
+
+			if (w > bw) {
+				rcText.left = rc.left + DCX_BOXTEXTSPACING;
+				rcText.right = rc.right - DCX_BOXTEXTSPACING;
+			}
+			else {
+				if (this->m_iBoxStyles & BOXS_RIGHT)
+					rcText.left = rc.right - DCX_BOXTEXTSPACING - w;
+				else if (this->m_iBoxStyles & BOXS_CENTER)
+					rcText.left = (rc.left + rc.right - w) /2;
+				else
+					rcText.left = rc.left + DCX_BOXTEXTSPACING;
+
+				rcText.right = rcText.left + w;
+			}
+
+			CopyRect(&rcText2, &rcText);
+			InflateRect(&rcText2, 3, 0);
+			FillRect(hdc, &rcText2, hBrush);
+			SetBkMode(hdc, TRANSPARENT);
+
+			if (this->m_clrText != -1)
+				SetTextColor(hdc, this->m_clrText);
+
+			DrawText(hdc, text, n, &rcText, DT_LEFT | DT_END_ELLIPSIS);
+			SelectObject(hdc, hOldBrush);
+
+			if (this->m_clrText != -1)
+				SelectObject(hdc, hOldPen);
+
+			if (this->m_hFont != NULL)
+				SelectObject(hdc, oldFont);
+
+			EndPaint(this->m_Hwnd, &ps);
+			delete []text;
+		}
+
+		bParsed = TRUE;
+		return 0L;
+	}
+	break;
+
     case WM_MOUSEMOVE:
       {
         this->m_pParentDialog->setMouseControl( this->getUserID( ) );


implement CCPromoteToType

implement CCPromoteToType

git-svn-id: a4a6f32337ebd29ad4763b423022f00f68d1c7b7@34720 91177308-0d34-0410-b5e6-96231b3b80d8

--- TableGen/CallingConvEmitter.cpp
+++ TableGen/CallingConvEmitter.cpp
@@ -26,9 +26,11 @@
   // other.
   for (unsigned i = 0, e = CCs.size(); i != e; ++i) {
     O << "static bool " << CCs[i]->getName()
-      << "(unsigned ValNo, MVT::ValueType ValVT, MVT::ValueType LocVT,\n"
+      << "(unsigned ValNo, MVT::ValueType ValVT,\n"
       << std::string(CCs[i]->getName().size()+13, ' ')
-      << "CCValAssign::LocInfo LocInfo, unsigned ArgFlags, CCState &State);\n";
+      << "MVT::ValueType LocVT, CCValAssign::LocInfo LocInfo,\n"
+      << std::string(CCs[i]->getName().size()+13, ' ')
+      << "unsigned ArgFlags, CCState &State);\n";
   }

   // Emit each calling convention description in full.
@@ -42,11 +44,11 @@
   Counter = 0;

   O << "\n\nstatic bool " << CC->getName()
-    << "(unsigned ValNo, MVT::ValueType ValVT, MVT::ValueType LocVT,\n"
+    << "(unsigned ValNo, MVT::ValueType ValVT,\n"
     << std::string(CC->getName().size()+13, ' ')
-    << "CCValAssign::LocInfo LocInfo, "
+    << "MVT::ValueType LocVT, CCValAssign::LocInfo LocInfo,\n"
+    << std::string(CC->getName().size()+13, ' ')
     << "unsigned ArgFlags, CCState &State) {\n";
-
   // Emit all of the actions, in order.
   for (unsigned i = 0, e = CCActions->getSize(); i != e; ++i) {
     O << "\n";
@@ -68,7 +70,7 @@
       ListInit *VTs = Action->getValueAsListInit("VTs");
       for (unsigned i = 0, e = VTs->getSize(); i != e; ++i) {
         Record *VT = VTs->getElementAsRecord(i);
-        if (i != 0) O << " || \n    " << IndentStr;
+        if (i != 0) O << " ||\n    " << IndentStr;
         O << "LocVT == " << getEnumName(getValueType(VT));
       }

@@ -115,11 +117,14 @@

       O << IndentStr << "unsigned Offset" << ++Counter
         << " = State.AllocateStack(" << Size << ", " << Align << ");\n";
-      O << IndentStr << "State.addLoc(CCValAssign::getMem(ValNo, ArgVT, Offset"
+      O << IndentStr << "State.addLoc(CCValAssign::getMem(ValNo, ValVT, Offset"
         << Counter << ", LocVT, LocInfo));\n";
       O << IndentStr << "return false;\n";
     } else if (Action->isSubClassOf("CCPromoteToType")) {
-
+      Record *DestTy = Action->getValueAsDef("DestTy");
+      O << IndentStr << "LocVT = " << getEnumName(getValueType(DestTy)) <<";\n";
+      O << IndentStr << "LocInfo = (ArgFlags & 1) ? CCValAssign::SExt"
+        << " : CCValAssign::ZExt;\n";
     } else {
       Action->dump();
       throw "Unknown CCAction!";


Change the element builder semantic

Change the element builder semantic

BZ: 122982

To parse XML, the PFW uses factories containing a map of XML tags and
their associated builder builder. The builders used to contain the XML
tag of the XML element that it will use in the context of the factory.
A builder and an XML tag are already linked by the factory, thus the tag
member in the builder is redundant.

Remove the XML tag builder attribute and provide it on factory filling.

Change-Id: I827c3b34dffb23bc850316d0b092b31c21987ac2
Signed-off-by: Kevin Rocard <bd9a896220d78c7807307c046053ff427b594938@intel.com>

--- FSSubsystemBuilder.cpp
+++ FSSubsystemBuilder.cpp
@@ -31,6 +31,6 @@
 {
 void getFSSubsystemBuilder(CSubsystemLibrary* pSubsystemLibrary)
 {
-    pSubsystemLibrary->addElementBuilder(new TNamedElementBuilderTemplate<CFSSubsystem>("FS"));
+    pSubsystemLibrary->addElementBuilder("FS", new TNamedElementBuilderTemplate<CFSSubsystem>());
 }
 }


Removed overlaps on SPD services (M. Sitta)

--- ITS/AliITSv11GeometrySPD.cxx
+++ ITS/AliITSv11GeometrySPD.cxx
@@ -3073,13 +3073,13 @@
     for (Int_t i = 0; i < 10; i++) {
         TGeoRotation *rot1 = new TGeoRotation(*gGeoIdentity);
         rot1->RotateY(-90.0);
-        rot1->RotateX(45.0);
+        rot1->RotateX(44.7);
         rot1->RotateZ(90.0 - angle[i]);
         TGeoCombiTrans *tr1 = new TGeoCombiTrans(0.0, 0.0, 40.5, rot1);
         moth->AddNode(module, 2*i, tr1);
         TGeoRotation *rot2 = new TGeoRotation(*gGeoIdentity);
         rot2->RotateY(90.0);
-        rot2->RotateX(-45.0);
+        rot2->RotateX(-44.7);
         rot2->RotateZ(90.0 - angle[i]);
         TGeoCombiTrans *tr2 = new TGeoCombiTrans(0.0, 0.0, -40.5, rot2);
         moth->AddNode(module, 2*i+1, tr2);


Move gups user stats insertion before work

--- system/Gups_tests.cpp
+++ system/Gups_tests.cpp
@@ -51,6 +51,17 @@

   func_gups gups( A );

+  double runtime = 0.0;
+  double throughput = 0.0;
+  int nnodes = atoi(getenv("SLURM_NNODES"));
+  double throughput_per_node = 0.0;
+
+  SoftXMT_add_profiling_value( &runtime, "runtime", "s", false, 0.0 );
+  SoftXMT_add_profiling_integer( &FLAGS_iterations, "iterations", "it", false, 0 );
+  SoftXMT_add_profiling_integer( &FLAGS_sizeA, "sizeA", "entries", false, 0 );
+  SoftXMT_add_profiling_value( &throughput, "updates_per_s", "up/s", false, 0.0 );
+  SoftXMT_add_profiling_value( &throughput_per_node, "updates_per_s_per_node", "up/s", false, 0.0 );
+
   fork_join_custom( &start_profiling );

   double start = wall_clock_time();
@@ -59,22 +70,11 @@

   fork_join_custom( &stop_profiling );

-<<<<<<< HEAD
-  Grappa_merge_and_dump_stats();
+  runtime = end - start;
+  throughput = FLAGS_iterations / runtime;

-=======
->>>>>>> change stats to dump a single JSON blob
-  double runtime = end - start;
-  double throughput = FLAGS_iterations / runtime;
+  throughput_per_node = throughput/nnodes;

-  int nnodes = atoi(getenv("SLURM_NNODES"));
-  double throughput_per_node = throughput/nnodes;
-
-  SoftXMT_add_profiling_value( &runtime, "runtime", "s", false, 0.0 );
-  SoftXMT_add_profiling_integer( &FLAGS_iterations, "iterations", "it", false, 0 );
-  SoftXMT_add_profiling_integer( &FLAGS_sizeA, "sizeA", "entries", false, 0 );
-  SoftXMT_add_profiling_value( &throughput, "updates_per_s", "up/s", false, 0.0 );
-  SoftXMT_add_profiling_value( &throughput_per_node, "updates_per_s_per_node", "up/s", false, 0.0 );

   SoftXMT_merge_and_dump_stats();


fix case for util include in plugins/multi_target.hpp

--- plugins/multi_target.hpp
+++ plugins/multi_target.hpp
@@ -32,8 +32,8 @@

 #include "../algorithms/object_encoder.hpp"
 #include "../data_structures/search_engine.hpp"
-#include "../Util/json_renderer.hpp"
-#include "../Util/timing_util.hpp"
+#include "../util/json_renderer.hpp"
+#include "../util/timing_util.hpp"

 template <class DataFacadeT, bool forward> class MultiTargetPlugin final : public BasePlugin
 {


blah

blah

git-svn-id: 767549f2a3626ae39d79f5348867a3ebb5082aca@1490 c7283977-0100-402a-a91a-fa70b306dbfe

--- ros_workspace/translators/src/ros2lcm.cpp
+++ ros_workspace/translators/src/ros2lcm.cpp
@@ -536,7 +536,7 @@

   App *app = new App( "camera", "CAMERA", nh);
   std::cout << "ros2lcm translator ready\n";
-  ros::spin();
+  //ros::spin();


STYLE: Better warning message and comments describing cases.

--- Infovis/vtkPCAStatistics.cxx
+++ Infovis/vtkPCAStatistics.cxx
@@ -23,7 +23,7 @@
 #define VTK_PCA_COMPCOLUMN "PCA"

-vtkCxxRevisionMacro(vtkPCAStatistics,"1.5");
+vtkCxxRevisionMacro(vtkPCAStatistics,"1.6");
 vtkStandardNewMacro(vtkPCAStatistics);

 const char* vtkPCAStatistics::NormalizationSchemeEnumNames[NUM_NORMALIZATION_SCHEMES + 1] =
@@ -85,30 +85,39 @@
     vtkGenericWarningMacro( "No \"" VTK_MULTICORRELATIVE_AVERAGECOL "\" column in request." );
     return false;
     }
-  vtkIdType mrmr = reqModel->GetNumberOfRows();
-  vtkIdType ermr;
+  // Check that the derived model includes additional rows specifying the
+  // normalization as required.
+  vtkIdType mrmr = reqModel->GetNumberOfRows(); // actual number of rows
+  vtkIdType ermr; // expected number of rows
   switch ( normScheme )
     {
-    case vtkPCAStatistics::NONE:
-      ermr = 2 * m + 1;
-      break;
-    case vtkPCAStatistics::DIAGONAL_SPECIFIED:
-    case vtkPCAStatistics::DIAGONAL_VARIANCE:
-      ermr = 2 * m + 2;
-      break;
-    case vtkPCAStatistics::TRIANGLE_SPECIFIED:
-      ermr = 3 * m + 1;
-      break;
-    case vtkPCAStatistics::NUM_NORMALIZATION_SCHEMES:
-    default:
-      ermr = 5 * m; // sure to fail
-      break;
-    }
+  case vtkPCAStatistics::NONE:
+    // m+1 covariance/Cholesky rows, m eigenvector rows, no normalization factors
+    ermr = 2 * m + 1;
+    break;
+  case vtkPCAStatistics::DIAGONAL_SPECIFIED:
+  case vtkPCAStatistics::DIAGONAL_VARIANCE:
+    // m+1 covariance/Cholesky rows, m eigenvector rows, 1 normalization factor row
+    ermr = 2 * m + 2;
+    break;
+  case vtkPCAStatistics::TRIANGLE_SPECIFIED:
+    // m+1 covariance/Cholesky rows, m eigenvector rows, m normalization factor rows
+    ermr = 3 * m + 1;
+    break;
+  case vtkPCAStatistics::NUM_NORMALIZATION_SCHEMES:
+  default:
+      {
+      vtkGenericWarningMacro( "The normalization scheme specified (" << normScheme << ") is invalid." );
+      return false;
+      }
+    break;
+    }
+  // Allow derived classes to add rows, but never allow fewer than required.
   if ( mrmr < ermr )
     {
     vtkGenericWarningMacro(
-                           "Expected " << ( 2 * m + 1 ) << " or more columns in request but found "
-                           << reqModel->GetNumberOfRows() << "." );
+      "Expected " << ( 2 * m + 1 ) << " or more columns in request but found "
+      << reqModel->GetNumberOfRows() << "." );
     return false;
     }


INTEGRATION: CWS dba203c (1.43.6); FILE MERGED 2006/04/24 13:17:57 oj 1.43.6.2: RESYNC: (1.43-1.45); FILE MERGED 2006/04/20 10:22:47 fs 1.43.6.1: #i63103# +WheelWithoutFocus property at the window peer

--- toolkit/source/controls/unocontrolmodel.cxx
+++ toolkit/source/controls/unocontrolmodel.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unocontrolmodel.cxx,v $
  *
- *  $Revision: 1.45 $
+ *  $Revision: 1.46 $
  *
- *  last change: $Author: hr $ $Date: 2006-04-20 13:23:00 $
+ *  last change: $Author: rt $ $Date: 2006-05-04 08:26:08 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -424,6 +424,7 @@
             case BASEPROPERTY_REPEAT:
             case BASEPROPERTY_HARDLINEBREAKS:       aDefault <<= (sal_Bool) sal_False; break;

+            case BASEPROPERTY_WHEELWITHOUTFOCUS:
             case BASEPROPERTY_HIDEINACTIVESELECTION:
             case BASEPROPERTY_ENFORCE_FORMAT:
             case BASEPROPERTY_AUTOCOMPLETE:


Fix parsing of some more missed block comment

Fixes https://github.com/sass/libsass/issues/1007

--- parser.cpp
+++ parser.cpp
@@ -448,6 +448,7 @@
       sel = parse_selector_group();
     }
     bool old_in_at_root = in_at_root;
+    lex < css_comments >();
     in_at_root = false;
     ParserState r_source_position = pstate;
     if (!peek< exactly<'{'> >()) error("expected a '{' after the selector", pstate);
@@ -960,9 +961,9 @@
     else {
       error("invalid property name", pstate);
     }
-    if (!lex< one_plus< exactly<':'> > >()) error("property \"" + string(lexed) + "\" must be followed by a ':'", pstate);
-    if (peek< exactly<';'> >()) error("style declaration must contain a value", pstate);
-    if (peek< static_value >()) {
+    if (!lex_css< one_plus< exactly<':'> > >()) error("property \"" + string(lexed) + "\" must be followed by a ':'", pstate);
+    if (peek_css< exactly<';'> >()) error("style declaration must contain a value", pstate);
+    if (peek_css< static_value >()) {
       return new (ctx.mem) Declaration(prop->pstate(), prop, parse_static_value()/*, lex<important>()*/);
     }
     else {


Adding a quick and dirty way to inspect the distortion on a per-beam basis.

--- ros-pkg/core/clams/src/lib/slam_calibrator.cpp
+++ ros-pkg/core/clams/src/lib/slam_calibrator.cpp
@@ -176,6 +176,25 @@
       sseq.proj_.estimateMapDepth(map, traj.get(idx).inverse().cast<float>(),
                                   measurement, mapframe.depth_.get());
       counts[i] = model->accumulate(*mapframe.depth_, *measurement.depth_);
+
+      // -- Quick and dirty option for data inspection.
+      if(getenv("U") && getenv("V")) {
+        int u_center = atoi(getenv("U"));
+        int v_center = atoi(getenv("V"));
+        int radius = 1;
+        for(int u = max(0, u_center - radius); u < min(640, u_center + radius + 1); ++u) {
+          for(int v = max(0, v_center - radius); v < min(480, v_center + radius + 1); ++v) {
+            if(mapframe.depth_->coeffRef(v, u) == 0)
+              continue;
+            if(measurement.depth_->coeffRef(v, u) == 0)
+              continue;
+            cerr << mapframe.depth_->coeffRef(v, u) * 0.001
+                 << " "
+                 << measurement.depth_->coeffRef(v, u) * 0.001
+                 << endl;
+          }
+        }
+      }
     }

     return counts.sum();


added autopilot switch with a space-bar

added autopilot switch with a space-bar

--- tools/bonsaiRenderer/density/renderloop.cpp
+++ tools/bonsaiRenderer/density/renderloop.cpp
@@ -1005,6 +1005,7 @@

   void dumpImage(const std::string &fileNameBase)
   {
+    if (!m_autopilot) return;
     if (!isMaster()) return;
     if (fileNameBase.empty()) return;

@@ -1040,17 +1041,19 @@
       }
     fclose(fout);

-    if (m_frameCount >= m_idata.getCamera().nFrames())
+    if (m_frameCount >= m_idata.getCamera().nFrames() && m_autopilot && !fileNameBase.empty())
       dataSetFunc(-1);
   }

   void display()
   {
+    MPI_Bcast(&m_autopilot, 1, MPI_INT, 0, comm);
     //double startTime = GetTimer();
     //double getBodyDataTime = startTime;

-    m_frameCount++;
+    if (m_autopilot)
+      m_frameCount++;

     if (m_renderingEnabled)
     {
@@ -1074,7 +1077,7 @@
       m_cameraTransLag = m_cameraTrans;
       m_cameraRotLag = m_cameraRot;
 #endif
-      if (m_idata.isCameraPath())
+      if (m_idata.isCameraPath() && m_autopilot)
       {
         const auto &cam = m_idata.getCamera().getFrame(m_frameCount-1);
         m_cameraRotLag  .x = cam. rotx;
@@ -1083,6 +1086,11 @@
         m_cameraTransLag.x = cam.tranx;
         m_cameraTransLag.y = cam.trany;
         m_cameraTransLag.z = cam.tranz;
+
+#if 0
+        m_cameraTrans = m_cameraTransLag;
+        m_cameraRot   = m_cameraRotLag;
+#endif
       }
       float cameraTemp[7] =
       {
@@ -1163,7 +1171,7 @@
         calculateCursorPos();
       }

-      if (m_flyMode && !m_idata.isCameraPath()) {
+      if (m_flyMode && !m_idata.isCameraPath() && m_autopilot) {
         glRotatef(m_cameraRotLag.z, 0.0, 0.0, 1.0);
         glRotatef(m_cameraRotLag.x, 1.0, 0.0, 0.0);
         glRotatef(m_cameraRotLag.y, 0.0, 1.0, 0.0);
@@ -1176,7 +1184,7 @@

       } else {
         // orbit viwer - rotate around centre, then translate
-        if (m_idata.isCameraPath())
+        if (m_idata.isCameraPath() && m_autopilot)
         {
           glLoadIdentity();
           glRotatef(m_cameraRotLag.x, 1.0, 0.0, 0.0);
@@ -1397,6 +1405,7 @@
         toggleDomainView();
         break;
       case ' ':
+        fprintf(stderr, " Toggle autopilot @ frame= %d\n", m_frameCount);
         togglePause();
         break;
       case 27: // escape


Routing session tests UB fix.

Routing session tests UB fix.

--- routing/routing_tests/routing_session_test.cpp
+++ routing/routing_tests/routing_session_test.cpp
@@ -8,8 +8,8 @@

 #include "base/logging.hpp"

+#include "std/atomic.hpp"
 #include "std/chrono.hpp"
-#include "std/mutex.hpp"
 #include "std/string.hpp"
 #include "std/vector.hpp"

@@ -42,7 +42,7 @@
 };

 static vector<m2::PointD> kTestRoute = {{0., 1.}, {0., 2.}, {0., 3.}, {0., 4.}};
-static auto kRouteBuildingMaxDuration = seconds(30);
+static auto kTestMaxDuration = seconds(30);

 UNIT_TEST(TestRouteBuilding)
 {
@@ -51,17 +51,21 @@
   vector<m2::PointD> routePoints = kTestRoute;
   Route masterRoute("dummy", routePoints.begin(), routePoints.end());
   size_t counter = 0;
-  timed_mutex routeBuilded;
-  routeBuilded.lock();
+  atomic<bool> routeBuilded(false);
   unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, DummyRouter::NoError, counter);
   session.SetRouter(move(router), nullptr);
   session.BuildRoute(kTestRoute.front(), kTestRoute.back(),
                      [&routeBuilded](Route const &, IRouter::ResultCode)
                      {
-                       routeBuilded.unlock();
+                       routeBuilded = true;
                      },
                      nullptr, 0);
-  TEST(routeBuilded.try_lock_for(kRouteBuildingMaxDuration), ());
+  // Manual check of the routeBuilded mutex to avoid spurious results.
+  auto time = steady_clock::now() + kTestMaxDuration;
+  while (steady_clock::now() < time  && !routeBuilded)
+  {
+  }
+  TEST(routeBuilded, ("Route was not built."));
   TEST_EQUAL(counter, 1, ());
 }

@@ -73,18 +77,22 @@
   vector<m2::PointD> routePoints = kTestRoute;
   Route masterRoute("dummy", routePoints.begin(), routePoints.end());
   size_t counter = 0;
-  timed_mutex routeBuilded;
+  atomic<bool> routeBuilded(false);
   auto fn = [&routeBuilded](Route const &, IRouter::ResultCode)
             {
-              routeBuilded.unlock();
+              routeBuilded = true;
             };
-  routeBuilded.lock();
   unique_ptr<DummyRouter> router = make_unique<DummyRouter>(masterRoute, DummyRouter::NoError, counter);
   session.SetRouter(move(router), nullptr);

   // Go along the route.
   session.BuildRoute(kTestRoute.front(), kTestRoute.back(), fn, nullptr, 0);
-  TEST(routeBuilded.try_lock_for(kRouteBuildingMaxDuration), ());
+  // Manual check of the routeBuilded mutex to avoid spurious results.
+  auto time = steady_clock::now() + kTestMaxDuration;
+  while (steady_clock::now() < time  && !routeBuilded)
+  {
+  }
+  TEST(routeBuilded, ("Route was not built."));

   location::GpsInfo info;
   info.m_horizontalAccuracy = 0.01;
@@ -103,8 +111,12 @@

   // Rebuild route and go in opposite direction. So initiate a route rebuilding flag.
   counter = 0;
+  routeBuilded = false;
   session.BuildRoute(kTestRoute.front(), kTestRoute.back(), fn, nullptr, 0);
-  TEST(routeBuilded.try_lock_for(kRouteBuildingMaxDuration), ());
+  while (steady_clock::now() < time  && !routeBuilded)
+  {
+  }
+  TEST(routeBuilded, ("Route was not built."));

   info.m_longitude = 0.;
   info.m_latitude = 1.;


Disable automatically resizing swapchain if window is iconified

The size of the window is changed if the window is iconified, but that change should be ignored.

BUG=
R=shannonwoods@chromium.org

Review URL: https://codereview.appspot.com/19460043

--- src/libEGL/Surface.cpp
+++ src/libEGL/Surface.cpp
@@ -311,6 +311,13 @@
     int clientHeight = client.bottom - client.top;
     bool sizeDirty = clientWidth != getWidth() || clientHeight != getHeight();

+    if (IsIconic(getWindowHandle()))
+    {
+        // The window is automatically resized to 150x22 when it's minimized, but the swapchain shouldn't be resized
+        // because that's not a useful size to render to.
+        sizeDirty = false;
+    }
+
     if (mSwapIntervalDirty)
     {
         resetSwapChain(clientWidth, clientHeight);


Supports different begin and end in chunked

--- chunked.hpp
+++ chunked.hpp
@@ -3,6 +3,7 @@

 #include "internal/iterbase.hpp"
 #include "internal/iteratoriterator.hpp"
+#include "internal/iterator_wrapper.hpp"

 #include <vector>
 #include <algorithm>
@@ -32,15 +33,15 @@

   friend ChunkedFn;

-  using IndexVector = std::vector<iterator_type<Container>>;
+  using IndexVector = std::vector<IteratorWrapper<Container>>;
   using DerefVec = IterIterWrapper<IndexVector>;

  public:
   Chunker(Chunker&&) = default;
   class Iterator : public std::iterator<std::input_iterator_tag, DerefVec> {
    private:
-    iterator_type<Container> sub_iter;
-    iterator_type<Container> sub_end;
+    IteratorWrapper<Container> sub_iter;
+    IteratorWrapper<Container> sub_end;
     DerefVec chunk;
     std::size_t chunk_size = 0;

@@ -59,8 +60,8 @@
     }

    public:
-    Iterator(iterator_type<Container>&& in_iter,
-        iterator_type<Container>&& in_end, std::size_t s)
+    Iterator(IteratorWrapper<Container>&& in_iter,
+        IteratorWrapper<Container>&& in_end, std::size_t s)
         : sub_iter{std::move(in_iter)},
           sub_end{std::move(in_end)},
           chunk_size{s} {


Retrace: Add retrace watchdog flag (#815)

* retrace: Added retrace watchdog

Retrace watchdog triggers abort() if replay of a single api call will
take more than 30 seconds.

TEST=build and run glxgears on x86

* retrace: Fix some indention issue

Co-authored-by: Robert Tarasov <96420fbc74bf780fc4c3ee5eb1230a0b8568ea69@google.com>
Co-authored-by: Po-Hsien Wang <7447b9c171786ca9a643aab501e3aff88e4d2482@chromium.org>

--- retrace/retrace_main.cpp
+++ retrace/retrace_main.cpp
@@ -27,11 +27,13 @@

 #include <string.h>
+#include <atomic>
 #include <limits.h> // for CHAR_MAX
 #include <memory> // for unique_ptr
 #include <iostream>
 #include <regex>
 #include <getopt.h>
+#include <time.h>
 #ifndef _WIN32
 #include <unistd.h> // for isatty()
 #endif
@@ -89,6 +91,7 @@
 bool forceWindowed = true;
 bool dumpingState = false;
 bool dumpingSnapshots = false;
+bool watchdogEnabled = false;

 bool ignoreCalls = false;
 trace::CallSet callsToIgnore;
@@ -135,6 +138,86 @@
 static void
 takeSnapshot(unsigned call_no, bool backBuffer);

+/**
+ * Retrace watchdog.
+ *
+ * Retrace watchdog triggers abort() if retrace of a single api call
+ * will take more than {TimeoutInSec} seconds.
+ */
+class RetraceWatchdog
+{
+public:
+    enum {
+        // This is high because loading sequences can cause very expensive
+        // frames with shader compiles, etc, and we do not want flaky results
+        // on occasionally devices.
+        TimeoutInSec = 300,
+        RunnerSleepInMills = 1000,
+    };
+
+    static uint32_t get_time_u32() {
+        return static_cast<uint32_t>(time(NULL));
+    }
+
+    static uint32_t get_duration_u32(uint32_t from, uint32_t to) {
+        if (to <= from) return 0;
+        return to - from;
+    }
+
+private:
+    typedef std::chrono::time_point<std::chrono::system_clock> TimePoint;
+
+    RetraceWatchdog()
+    : last_call_mark(get_time_u32()), want_exit(false) {
+        thread = os::thread(runnerThread, this);
+    }
+
+    std::thread thread;
+    std::atomic<uint64_t> last_call_mark;
+    std::atomic<bool> want_exit;
+
+    static void runnerThread(RetraceWatchdog* rw) {
+        while(!rw->want_exit) {
+            // Once a second check if progress has been made.
+            uint64_t mark = rw->last_call_mark;
+            uint32_t dur = get_duration_u32(
+                    static_cast<uint32_t>(mark&0xFFFFFFFF),
+                    get_time_u32()
+                );
+
+            if (dur >= static_cast<uint32_t>(TimeoutInSec)) {
+                fprintf(
+                    stderr,
+                    "Exception: Retrace watchdog timeout has occured at call %u!\n",
+                    static_cast<uint32_t>(mark >> 32));
+                abort();
+            }
+            os::sleep(RunnerSleepInMills * 1000);
+        }
+    }
+
+public:
+    ~RetraceWatchdog() {
+        want_exit = true;
+        if (thread.joinable()) {
+           thread.join();
+        }
+    }
+    // Assuming we use C++ 11 or newer therefore the following singleton
+    // implementation is thread safe
+    static RetraceWatchdog& Instance() {
+        static RetraceWatchdog inst;
+        return inst;
+    }
+
+    void CallProcessed(uint32_t call_no) {
+      // Record time and monotonic number/id of last trace call.
+      last_call_mark = (static_cast<uint64_t>(call_no) << 32) | get_time_u32();
+    }
+
+    RetraceWatchdog(RetraceWatchdog const&) = delete;
+    void operator=(RetraceWatchdog const&) = delete;
+};

 /**
  * Called when we are about to present.
@@ -476,6 +559,8 @@
             assert(call->thread_id == leg);

             retraceCall(call);
+            if (watchdogEnabled)
+              RetraceWatchdog::Instance().CallProcessed(call->no);
             if (!call->reuse_call)
                 delete call;
             call = parser->parse_call();
@@ -649,6 +734,8 @@
         trace::Call *call;
         while ((call = parser->parse_call())) {
             retraceCall(call);
+            if (watchdogEnabled)
+                RetraceWatchdog::Instance().CallProcessed(call->no);
             if (!call->reuse_call)
                 delete call;
         }
@@ -724,6 +811,7 @@
         "      --per-frame-delay=MICROSECONDS   add extra delay after each frame (in addition to min-frame-duration)\n"
         "  -w, --wait              waitOnFinish on final frame\n"
         "      --loop[=N]          loop N times (N<0 continuously) replaying final frame.\n"
+        "      --watchdog          invokes abort() if retrace of a single api call will take more than " << retrace::RetraceWatchdog::TimeoutInSec << " seconds\n"
         "      --singlethread      use a single thread to replay command stream\n"
         "      --ignore-retvals    ignore return values in wglMakeCurrent, etc\n"
         "      --no-context-check  don't check that the actual GL context version matches the requested version\n"
@@ -752,6 +840,7 @@
     GENPASS_OPT,
     MSAA_NO_RESOLVE_OPT,
     SB_OPT,
+    WATCHDOG_OPT,
     MIN_FRAME_DURATION_OPT,
     PER_FRAME_DELAY_OPT,
     LOOP_OPT,
@@ -812,6 +901,7 @@
     {"snapshot-threaded", no_argument, 0, 't'},
     {"verbose", no_argument, 0, 'v'},
     {"wait", no_argument, 0, 'w'},
+    {"watchdog", no_argument, 0, WATCHDOG_OPT},
     {"min-frame-duration", required_argument, 0, MIN_FRAME_DURATION_OPT},
     {"per-frame-delay", required_argument, 0, PER_FRAME_DELAY_OPT},
     {"loop", optional_argument, 0, LOOP_OPT},
@@ -1195,6 +1285,9 @@
         case MIN_FRAME_DURATION_OPT:
             minFrameDurationUsec = trace::intOption(optarg, 0);
             break;
+        case WATCHDOG_OPT:
+            retrace::watchdogEnabled = true;
+            break;
         case PER_FRAME_DELAY_OPT:
             perFrameDelayUsec = trace::intOption(optarg, 0);
             break;


Seed with time

Seed with time

--- Code/main.cpp
+++ Code/main.cpp
@@ -1,4 +1,5 @@
 #include <iostream>
+#include <ctime>
 #include <RandomNumberGenerator.h>
 #include "Sampler.h"
 #include "MyModel.h"
@@ -8,12 +9,14 @@

 int main()
 {
+	// Initialise RNG and seed with time
 	RandomNumberGenerator::initialise_instance();
+	RandomNumberGenerator::get_instance().set_seed(time(0));

 	Sampler<MyModel> s(100, 1000);
 	s.initialise();

-	for(int i=0; i<10000; i++)
+	for(int i=0; i<1000; i++)
 		s.update();

 	return 0;


Added occupied heating setpoint default reporting for Bitron 902010/32

--- bindings.cpp
+++ bindings.cpp
@@ -1182,6 +1182,23 @@

             return sendConfigureReportingRequest(bt, {rq, rq2, rq3}) || // Use OR because of manuf. specific attributes
                    sendConfigureReportingRequest(bt, {rq4, rq5});
+        }
+        else if (sensor && sensor->modelId() == QLatin1String("902010/32")) // Bitron thermostat
+        {
+            rq.dataType = deCONZ::Zcl16BitInt;
+            rq.attributeId = 0x0000;         // local temperature
+            rq.minInterval = 0;
+            rq.maxInterval = 300;
+            rq.reportableChange16bit = 10;
+
+            ConfigureReportingRequest rq2;
+            rq2.dataType = deCONZ::Zcl8BitUint;
+            rq2.attributeId = 0x0012;        // Occupied heating setpoint
+            rq2.minInterval = 1;
+            rq2.maxInterval = 600;
+            rq2.reportableChange8bit = 1;
+
+            return sendConfigureReportingRequest(bt, {rq, rq2});
         }

         else


feat(library/module): improve 'import module' error messages

Signed-off-by: Leonardo de Moura <7610bae85f2b530654cc716772f1fe653373e892@microsoft.com>

--- src/library/module.cpp
+++ src/library/module.cpp
@@ -207,7 +207,7 @@
         std::string header;
         d1 >> header;
         if (header != g_olean_header)
-            throw exception(sstream() << "file '" << fname << "' does not seem to be a valid object Lean file");
+            throw exception(sstream() << "file '" << fname << "' does not seem to be a valid object Lean file, invalid header");
         unsigned major, minor, claimed_hash;
         d1 >> major >> minor >> claimed_hash;
         // Enforce version?
@@ -224,7 +224,7 @@

         unsigned computed_hash = hash(code_size, [&](unsigned i) { return code[i]; });
         if (claimed_hash != computed_hash)
-            throw exception(sstream() << "file '" << fname << "' has been corrupted");
+            throw exception(sstream() << "file '" << fname << "' has been corrupted, checksum mismatch");

         module_info_ptr r = std::make_shared<module_info>();
         r->m_name         = mname;
@@ -324,7 +324,7 @@
                 object_readers & readers = get_object_readers();
                 auto it = readers.find(k);
                 if (it == readers.end())
-                    throw exception(sstream() << "file '" << r->m_fname << "' has been corrupted");
+                    throw exception(sstream() << "file '" << r->m_fname << "' has been corrupted, unknown object");
                 it->second(d, r->m_module_idx, m_senv, add_asynch_update, add_delayed_update);
             }
             obj_counter++;


mtnormalise: some more final cleaning up

--- cmd/mtnormalise.cpp
+++ cmd/mtnormalise.cpp
@@ -25,7 +25,7 @@

 #define DEFAULT_NORM_VALUE 0.28209479177
 #define DEFAULT_MAIN_ITER_VALUE 15
-#define DEFAULT_INNER_MAXITER_VALUE 7
+#define DEFAULT_BALANCE_MAXITER_VALUE 7
 #define DEFAULT_POLY_ORDER 3

 const char* poly_order_choices[] = { "0", "1", "2", "3", nullptr };
@@ -306,7 +306,7 @@
   const float normalisation_value = get_option_value ("value", DEFAULT_NORM_VALUE);
   const float log_norm_value = std::log (normalisation_value);
   const size_t max_iter = get_option_value ("niter", DEFAULT_MAIN_ITER_VALUE);
-  const size_t max_inner_iter = DEFAULT_INNER_MAXITER_VALUE;
+  const size_t max_balance_iter = DEFAULT_BALANCE_MAXITER_VALUE;

   // Initialise normalisation fields in both image and log domain
   Eigen::MatrixXd norm_field_weights;
@@ -325,8 +325,8 @@

   // Store lambda-function for performing outlier-rejection.
   // We perform a coarse outlier-rejection initially as well as
-  // a finer outlier-rejection within the inner loop when computing
-  // tissue balance factors
+  // a finer outlier-rejection within each iteration of the
+  // tissue (re)balancing loop
   auto outlier_rejection = [&](float outlier_range) {

     auto summed_log = ImageType::scratch (header_3D, "Log of summed tissue volumes");
@@ -387,7 +387,7 @@
     size_t balance_iter = 1;
     bool balance_converged = false;

-    while (!balance_converged && balance_iter <= max_inner_iter) {
+    while (!balance_converged && balance_iter <= max_balance_iter) {

       DEBUG ("Balance and outlier rejection iteration " + str(balance_iter) + " starts.");


RestoreSink: Slightly reduce the number of concurrent FDs

--- src/libutil/archive.cc
+++ src/libutil/archive.cc
@@ -282,6 +282,7 @@
     void createRegularFile(const Path & path)
     {
         Path p = dstPath + path;
+        fd.close();
         fd = open(p.c_str(), O_CREAT | O_EXCL | O_WRONLY, 0666);
         if (fd == -1) throw SysError(format("creating file `%1%'") % p);
     }


LineAndColumn: add comparison operators

LineAndColumn: add comparison operators

--- src/line_and_column.hh
+++ src/line_and_column.hh
@@ -27,14 +27,33 @@

     EffectiveType operator-(const EffectiveType& other) const
     {
-        return EffectiveType(line + other.line, column + other.column);
+        return EffectiveType(line - other.line, column - other.column);
     }

     EffectiveType& operator-=(const EffectiveType& other)
     {
-        line   += other.line;
-        column += other.column;
+        line   -= other.line;
+        column -= other.column;
         return *static_cast<EffectiveType*>(this);
+    }
+
+    bool operator< (const EffectiveType& other) const
+    {
+        if (line != other.line)
+            return line < other.line;
+        return column < other.column;
+    }
+
+    bool operator<= (const EffectiveType& other) const
+    {
+        if (line != other.line)
+            return line < other.line;
+        return column <= other.column;
+    }
+
+    bool operator== (const EffectiveType& other) const
+    {
+        return line == other.line and column == other.column;
     }
 };


From Valeri Fine:
Remove a confusing message

git-svn-id: acec3fd5b7ea1eb9e79d6329d318e8118ee2e14f@17125 27541ba8-7e3a-0410-8455-c3a389f83636

--- table/src/TVolume.cxx
+++ table/src/TVolume.cxx
@@ -1,4 +1,4 @@
-// @(#)root/table:$Name:  $:$Id: TVolume.cxx,v 1.15 2006/07/19 17:23:41 pcanal Exp $
+// @(#)root/table:$Name:  $:$Id: TVolume.cxx,v 1.16 2006/12/06 05:53:33 brun Exp $
 // Author: Valery Fine   10/12/98

 /*************************************************************************
@@ -108,8 +108,7 @@
    fOption = option;
    fVisibility = kBothVisible;

-   if(!fShape) {Printf("Illegal referenced shape"); return;}
-   ImportShapeAttributes();
+   if(fShape) ImportShapeAttributes();
 }

@@ -136,8 +135,7 @@
    fOption = option;
    fVisibility = kBothVisible;
    SetTitle(title);
-   if(!shape) {Printf("Illegal referenced shape"); return;}
-   ImportShapeAttributes();
+   if(shape) ImportShapeAttributes();
 }

 //______________________________________________________________________________


Add some new tokens

Add some new tokens

--- lib/src/models/image.cpp
+++ lib/src/models/image.cpp
@@ -1212,9 +1212,19 @@
 	tokens.insert("width", Token(m_size.width(), 0));
 	tokens.insert("mpixels", Token(m_size.width() * m_size.height(), 0));
 	tokens.insert("url_file", Token(m_url, ""));
+	tokens.insert("url_sample", Token(m_sampleUrl.toString(), ""));
+	tokens.insert("url_thumbnail", Token(m_previewUrl.toString(), ""));
 	tokens.insert("url_page", Token(m_pageUrl.toString(), ""));
 	tokens.insert("source", Token(m_source, ""));
 	tokens.insert("filesize", Token(m_fileSize, 0));
+	tokens.insert("author", Token(m_author, ""));
+	tokens.insert("authorid", Token(m_authorId, 0));
+	tokens.insert("parentid", Token(m_parentId, 0));
+
+	// Flags
+	tokens.insert("has_children", Token(m_hasChildren, false));
+	tokens.insert("has_note", Token(m_hasNote, false));
+	tokens.insert("has_comments", Token(m_hasComments, false));

 	// Search
 	for (int i = 0; i < m_search.size(); ++i)


(Deferred Shading) Fix some SVACE errors

1) Should use snprintf instead of sprintf
2) Should use strncpy instead of strcpy

Change-Id: If13366f0f176fdad3948bc1e8e425e430c233fc6

--- examples/deferred-shading/deferred-shading.cpp
+++ examples/deferred-shading/deferred-shading.cpp
@@ -458,6 +458,26 @@
 }

 //=============================================================================
+/// Create a String whose size can be evaluated at compile time
+struct ConstantString
+{
+  const char * const string;
+  const uint16_t size;
+
+  template<uint16_t inputSize>
+  constexpr ConstantString(const char (&input)[inputSize])
+  : string(input),
+    size(inputSize)
+  {
+  }
+};
+
+constexpr ConstantString POSITION_STRING("position");
+constexpr ConstantString RADIUS_STRING("radius");
+constexpr ConstantString COLOR_STRING("color");
+constexpr uint16_t LIGHT_SOURCE_BUFFER_SIZE(128u);
+
+//=============================================================================
 class DeferredShadingExample : public ConnectionTracker
 {
 public:
@@ -711,17 +731,17 @@
     auto iPropLightColor = light.RegisterProperty("lightcolor", color);

     // Create light source uniforms on lighting shader.
-    char buffer[128];
-    char* writep = buffer + sprintf(buffer, "uLights[%d].", mNumLights);
+    char buffer[LIGHT_SOURCE_BUFFER_SIZE];
+    char* writep = buffer + snprintf(buffer, LIGHT_SOURCE_BUFFER_SIZE, "uLights[%d].", mNumLights);
     ++mNumLights;

-    strcpy(writep, "position");
+    strncpy(writep, POSITION_STRING.string, POSITION_STRING.size);
     auto oPropLightPos = renderer.RegisterProperty(buffer, position);

-    strcpy(writep, "radius");
+    strncpy(writep, RADIUS_STRING.string, RADIUS_STRING.size);
     auto oPropLightRadius = renderer.RegisterProperty(buffer, radius);

-    strcpy(writep, "color");
+    strncpy(writep, COLOR_STRING.string, COLOR_STRING.size);
     auto oPropLightColor = renderer.RegisterProperty(buffer, color);

     // Constrain the light position, radius and color to lighting shader uniforms.


:wrench: Ooops actually start

:wrench: Ooops actually start

--- InteractiveNotifications/InteractiveNotifications.cpp
+++ InteractiveNotifications/InteractiveNotifications.cpp
@@ -118,7 +118,7 @@
 			}
 		}

-		std::string cmdLine = "cmd.exe \"start slack://" + escapedToastArgs + "^&userData=[{" + escapedArgs + "}]\"";
+		std::string cmdLine = "cmd.exe /C \"start slack://" + escapedToastArgs + "^&userData=[{" + escapedArgs + "}]\"";
 		WinExec(cmdLine.c_str(), SW_HIDE);

 		return HRESULT();


INTEGRATION: CWS ooo19126 (1.4.552); FILE MERGED 2005/09/05 14:31:13 rt 1.4.552.1: #i54170# Change license header: remove SISSL

--- filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
+++ filter/source/xmlfilteradaptor/XmlFilterAdaptor.hxx
@@ -1,61 +1,35 @@
 /*************************************************************************
  *
+ *  OpenOffice.org - a multi-platform office productivity suite
+ *
  *  $RCSfile: XmlFilterAdaptor.hxx,v $
  *
- *  $Revision: 1.4 $
- *
- *  last change: $Author: obo $ $Date: 2002-10-10 13:32:48 $
- *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
- *
- *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
- *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
- *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
- *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
- *
+ *  $Revision: 1.5 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-09-08 21:57:58 $
+ *
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
+ *
+ *
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
+ *
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************/


put degree symbols back in (were removed in rev 1.43)


Fixed (?) problem with R407C and TTSE https://github.com/ibell/coolprop/issues/69

Signed-off-by: Ian Bell <6f1c5b737f3c5cff42a9b8f8dcfce305d97fd07b@gmail.com>

--- CoolProp/FluidClass.cpp
+++ CoolProp/FluidClass.cpp
@@ -3781,11 +3781,7 @@
 			double hV = enthalpy_Trho(limits.Tmin,rhoV);
 			hmin_TTSE = hL;
 			hmax_TTSE = hL+(hV-hL)*2;
-			pmin_TTSE = params.ptriple;
-			if (pmin_TTSE<psatL)
-			{
-				pmin_TTSE = psatL;
-			}
+			pmin_TTSE = std::min(psatL, psatV);
 			pmax_TTSE = 2*reduce.p.Pa;
 		}


added safety check

added safety check

--- TerrainSDK/vtui/InstanceDlg.cpp
+++ TerrainSDK/vtui/InstanceDlg.cpp
@@ -1,7 +1,7 @@
 //
 // InstanceDlg.cpp
 //
-// Copyright (c) 2003-2006 Virtual Terrain Project
+// Copyright (c) 2003-2007 Virtual Terrain Project
 // Free for all uses, see license.txt for details.
 //

@@ -75,6 +75,9 @@

 vtTagArray *InstanceDlg::GetTagArray()
 {
+	if (m_iItem == -1)
+		return NULL;
+
 	m_dummy.Clear();

 	// Return a description of the current content item


chan-group test: Added test to Channel::groupSelfContactRemoveInfo.

--- tests/dbus/chan-group.cpp
+++ tests/dbus/chan-group.cpp
@@ -560,6 +560,14 @@
     expectedIds.sort();
     checkExpectedIds(mChan->groupContacts(), expectedIds);

+    mChan->groupRemoveContacts(QList<ContactPtr>() << mChan->groupSelfContact(), "I want to remove myself");
+    QCOMPARE(mLoop->exec(), 0);
+    QCOMPARE(mChan->groupSelfContactRemoveInfo().hasActor(), true);
+    QCOMPARE(mChan->groupSelfContactRemoveInfo().actor(), mChan->groupSelfContact());
+    QCOMPARE(mChan->groupSelfContactRemoveInfo().hasMessage(), true);
+    QCOMPARE(mChan->groupSelfContactRemoveInfo().message(), QString("I want to remove myself"));
+    QCOMPARE(mChan->groupSelfContactRemoveInfo().hasError(), false);
+
     mChan.reset();
 }


Fixed a copy/paste naming mistake in decoder_tests.cpp.

Review: https://reviews.apache.org/r/32341

--- 3rdparty/libprocess/src/tests/decoder_tests.cpp
+++ 3rdparty/libprocess/src/tests/decoder_tests.cpp
@@ -119,11 +119,11 @@
     "\r\n"
     "hi";

-  deque<Response*> requests = decoder.decode(data.data(), data.length());
+  deque<Response*> responses = decoder.decode(data.data(), data.length());
   ASSERT_FALSE(decoder.failed());
-  ASSERT_EQ(1, requests.size());
+  ASSERT_EQ(1, responses.size());

-  Response* response = requests[0];
+  Response* response = responses[0];

   EXPECT_EQ("200 OK", response->status);
   EXPECT_EQ(Response::BODY, response->type);


INTEGRATION: CWS tl37 (1.13.168); FILE MERGED 2007/04/11 12:36:47 tl 1.13.168.2: RESYNC: (1.13-1.14); FILE MERGED 2007/02/06 19:22:49 nn 1.13.168.1: #i74099# UseInteractionHandler moved out of GuessFilter

--- sc/source/filter/xml/XMLTableSourceContext.cxx
+++ sc/source/filter/xml/XMLTableSourceContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: XMLTableSourceContext.cxx,v $
  *
- *  $Revision: 1.14 $
+ *  $Revision: 1.15 $
  *
- *  last change: $Author: vg $ $Date: 2007-02-27 12:48:21 $
+ *  last change: $Author: hr $ $Date: 2007-06-27 12:44:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -158,7 +158,7 @@

                 aFileString = ScGlobal::GetAbsDocName( aFileString, pDoc->GetDocumentShell() );
                 if ( !aFilterString.Len() )
-                    ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, FALSE );
+                    ScDocumentLoader::GetFilterName( aFileString, aFilterString, aOptString, FALSE, FALSE );

                 BYTE nLinkMode = SC_LINK_NONE;
                 if ( nMode == sheet::SheetLinkMode_NORMAL )


INTEGRATION: CWS dba31a (1.8.28); FILE MERGED 2008/07/01 07:02:15 oj 1.8.28.5: #i77916# impl zoom and move config data into ext 2008/06/26 14:26:35 oj 1.8.28.4: #i77916# impl zooming in report builder 2008/06/25 12:21:35 oj 1.8.28.3: merge conflicts resolved 2008/06/24 12:07:48 oj 1.8.28.2: RESYNC: (1.8-1.9); FILE MERGED 2008/06/13 11:40:21 oj 1.8.28.1: #i88506# impl hyphenation

--- reportdesign/source/ui/report/dlgedfunc.cxx
+++ reportdesign/source/ui/report/dlgedfunc.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: dlgedfunc.cxx,v $
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -87,18 +87,21 @@
 {
     aScrollTimer.Stop();

-    OReportWindow* pReportWindow = m_pParent->getViewsWindow()->getView();
+    OReportWindow* pReportWindow = m_pParent->getSectionWindow()->getViewsWindow()->getView();
     OScrollWindowHelper* pScrollWindow = pReportWindow->getScrollWindow();

     Size aOut = pReportWindow->GetOutputSizePixel();
-    aOut.Width() -= REPORT_STARTMARKER_WIDTH;
+    Fraction aStartWith(long(REPORT_STARTMARKER_WIDTH));
+    aStartWith *= m_pParent->GetMapMode().GetScaleX();
+
+    aOut.Width() -= (long)aStartWith;

     Rectangle aOutRect( pScrollWindow->getScrollOffset(), aOut );
     aOutRect = m_pParent->PixelToLogic( aOutRect );
     //Rectangle aWorkArea = m_pParent->getView()->GetWorkArea();
     Point aGcc3WorkaroundTemporary;
     Rectangle aWorkArea(aGcc3WorkaroundTemporary,pScrollWindow->getTotalSize());
-    aWorkArea.Right() -= REPORT_STARTMARKER_WIDTH;
+    aWorkArea.Right() -= (long)aStartWith;
     aWorkArea = pScrollWindow->PixelToLogic( aWorkArea );
     if( !aOutRect.IsInside( rPos ) && aWorkArea.IsInside( rPos ) )
     {
@@ -126,7 +129,7 @@

 DlgEdFunc::DlgEdFunc( OReportSection* _pParent )
 :m_pParent(_pParent),
- m_pView(_pParent->getView()),
+ m_rView(_pParent->getSectionView()),
  m_xOverlappingObj(NULL),
  m_pOverlappingObj(NULL),
  m_bSelectionMode(false),
@@ -135,7 +138,7 @@
 {
     // m_pParent = _pParent;
     aScrollTimer.SetTimeoutHdl( LINK( this, DlgEdFunc, ScrollTimeout ) );
-    m_pView->SetActualWin( m_pParent);
+    m_rView.SetActualWin( m_pParent);
     aScrollTimer.SetTimeout( SELENG_AUTOREPEAT_INTERVAL );
 }

@@ -200,11 +203,11 @@
                 uno::Sequence<beans::PropertyValue> aArgs(1);
                 aArgs[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowProperties"));
                 aArgs[0].Value <<= sal_True;
-                m_pParent->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs);
-                m_pParent->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_pParent->getView());
+                m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController().executeUnChecked(SID_SHOW_PROPERTYBROWSER,aArgs);
+                m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
                 // TODO character in shapes
                 //    SdrViewEvent aVEvt;
-                // m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+                // m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
                 //    if ( aVEvt.pRootObj && aVEvt.pRootObj->ISA(SdrTextObj) )
                 //        SetInEditMode(static_cast<SdrTextObj *>(aVEvt.pRootObj),rMEvt, FALSE);
                 bHandled = TRUE;
@@ -212,28 +215,28 @@
         }
         else
         {
-            SdrHdl* pHdl = m_pView->PickHandle(m_aMDPos);
-            //m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
+            SdrHdl* pHdl = m_rView.PickHandle(m_aMDPos);
+            //m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(m_pView);

             // if selected object was hit, drag object
-            if ( pHdl!=NULL || m_pView->IsMarkedHit(m_aMDPos) )
+            if ( pHdl!=NULL || m_rView.IsMarkedHit(m_aMDPos) )
             {
                 bHandled = TRUE;
                 m_pParent->CaptureMouse();
-                m_pParent->getViewsWindow()->BegDragObj(m_aMDPos, pHdl,m_pView);
+                m_pParent->getSectionWindow()->getViewsWindow()->BegDragObj(m_aMDPos, pHdl,&m_rView);
             }
         }
     }
     else if ( rMEvt.IsRight() && !rMEvt.IsLeft() && rMEvt.GetClicks() == 1 ) // mark object when context menu was selected
     {
-        SdrPageView* pPV = m_pView->GetSdrPageView();
+        SdrPageView* pPV = m_rView.GetSdrPageView();
         SdrViewEvent aVEvt;
-        if ( m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt) != SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() )
-            m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
+        if ( m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt) != SDRHIT_MARKEDOBJECT && !rMEvt.IsShift() )
+            m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
         if ( aVEvt.pRootObj )
-            m_pView->MarkObj(aVEvt.pRootObj, pPV);
+            m_rView.MarkObj(aVEvt.pRootObj, pPV);
         else
-            m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
+            m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);

         bHandled = TRUE;
     }
@@ -249,7 +252,7 @@
 BOOL DlgEdFunc::MouseButtonUp( const MouseEvent& /*rMEvt*/ )
 {
     BOOL bHandled = FALSE;
-    m_pParent->getViewsWindow()->stopScrollTimer();
+    m_pParent->getSectionWindow()->getViewsWindow()->stopScrollTimer();
     return bHandled;
 }
 // -----------------------------------------------------------------------------
@@ -260,9 +263,9 @@
     const USHORT nClicks = rMEvt.GetClicks();
     if ( nClicks == 2 && rMEvt.IsLeft() )
     {
-        if ( m_pView->AreObjectsMarked() )
-        {
-            const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
+        if ( m_rView.AreObjectsMarked() )
+        {
+            const SdrMarkList& rMarkList = m_rView.GetMarkedObjectList();
             if (rMarkList.GetMarkCount() == 1)
             {
                 const SdrMark* pMark = rMarkList.GetMark(0);
@@ -300,25 +303,25 @@
         {
             case KEY_ESCAPE:
             {
-                if ( m_pParent->getViewsWindow()->IsAction() )
-                {
-                    m_pParent->getViewsWindow()->BrkAction();
+                if ( m_pParent->getSectionWindow()->getViewsWindow()->IsAction() )
+                {
+                    m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
                     bReturn = TRUE;
-                } // if ( m_pParent->getViewsWindow()->IsAction() )
-                else if ( m_pView->IsTextEdit() )
-                {
-                    m_pView->SdrEndTextEdit();
+                }
+                else if ( m_rView.IsTextEdit() )
+                {
+                    m_rView.SdrEndTextEdit();
                     bReturn = TRUE;
                 }
-                else if ( m_pView->AreObjectsMarked() )
-                {
-                    const SdrHdlList& rHdlList = m_pView->GetHdlList();
+                else if ( m_rView.AreObjectsMarked() )
+                {
+                    const SdrHdlList& rHdlList = m_rView.GetHdlList();
                     SdrHdl* pHdl = rHdlList.GetFocusHdl();
                     if ( pHdl )
                         ((SdrHdlList&)rHdlList).ResetFocusHdl();
                     else
-                        m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
-                        //m_pView->UnmarkAll();
+                        m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
+                        //m_rView.UnmarkAll();

                     deactivateOle(true);
                     bReturn = FALSE;
@@ -334,22 +337,22 @@
                 if ( !rCode.IsMod1() && !rCode.IsMod2() )
                 {
                     // mark next object
-                    if ( !m_pView->MarkNextObj( !rCode.IsShift() ) )
+                    if ( !m_rView.MarkNextObj( !rCode.IsShift() ) )
                     {
                         // if no next object, mark first/last
-                        m_pView->UnmarkAllObj();
-                        m_pView->MarkNextObj( !rCode.IsShift() );
+                        m_rView.UnmarkAllObj();
+                        m_rView.MarkNextObj( !rCode.IsShift() );
                     }

-                    if ( m_pView->AreObjectsMarked() )
-                        m_pView->MakeVisible( m_pView->GetAllMarkedRect(), *m_pParent);
+                    if ( m_rView.AreObjectsMarked() )
+                        m_rView.MakeVisible( m_rView.GetAllMarkedRect(), *m_pParent);

                     bReturn = TRUE;
                 }
                 else if ( rCode.IsMod1() && rCode.IsMod2())
                 {
                     // selected handle
-                    const SdrHdlList& rHdlList = m_pView->GetHdlList();
+                    const SdrHdlList& rHdlList = m_rView.GetHdlList();
                     ((SdrHdlList&)rHdlList).TravelFocusHdl( !rCode.IsShift() );

                     // guarantee visibility of focused handle
@@ -358,7 +361,7 @@
                     {
                         Point aHdlPosition( pHdl->GetPos() );
                         Rectangle aVisRect( aHdlPosition - Point( DEFAUL_MOVE_SIZE, DEFAUL_MOVE_SIZE ), Size( 200, 200 ) );
-                        m_pView->MakeVisible( aVisRect, *m_pParent);
+                        m_rView.MakeVisible( aVisRect, *m_pParent);
                     }

                     bReturn = TRUE;
@@ -370,14 +373,14 @@
             case KEY_LEFT:
             case KEY_RIGHT:
             {
-                m_pParent->getViewsWindow()->handleKey(rCode);
+                m_pParent->getSectionWindow()->getViewsWindow()->handleKey(rCode);
                 bReturn = TRUE;
             }
             break;
             case KEY_RETURN:
                 if ( !rCode.IsMod1() )
                 {
-                    const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
+                    const SdrMarkList& rMarkList = m_rView.GetMarkedObjectList();
                     if ( rMarkList.GetMarkCount() == 1 )
                     {
                         SdrObject* pObj = rMarkList.GetMark( 0 )->GetMarkedSdrObj();
@@ -387,10 +390,10 @@
                 break;
             default:
             {
-                bReturn = m_pView->KeyInput(_rEvent, m_pParent);
+                bReturn = m_rView.KeyInput(_rEvent, m_pParent);
             }
             break;
-        } // switch ( nCode )
+        }
     }

     if ( bReturn && m_pParent->IsMouseCaptured() )
@@ -415,9 +418,9 @@
                 SdrOle2Obj* pOleObj = dynamic_cast<SdrOle2Obj*>(_pObj);
                 if ( pOleObj->GetObjRef().is() )
                 {
-                    if (m_pView->IsTextEdit())
+                    if (m_rView.IsTextEdit())
                     {
-                        m_pView->SdrEndTextEdit();
+                        m_rView.SdrEndTextEdit();
                     }

                     pOleObj->AddOwnLightClient();
@@ -426,7 +429,7 @@
                     {
                         pOleObj->GetObjRef()->changeState( embed::EmbedStates::UI_ACTIVE );
                         m_bUiActive = true;
-                        OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController();
+                        OReportController& rController = m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
                         m_bShowPropertyBrowser = rController.isCommandChecked(SID_SHOW_PROPERTYBROWSER);
                         if ( m_bShowPropertyBrowser )
                             rController.executeChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue >());
@@ -457,14 +460,14 @@
                 m_bUiActive = false;
                 if ( m_bShowPropertyBrowser )
                 {
-                    OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController();
+                    OReportController& rController = m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
                     rController.executeChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< beans::PropertyValue >());
                 }

                 if ( _bSelect )
                 {
-                    SdrPageView* pPV = m_pView->GetSdrPageView();
-                    m_pView->MarkObj(pObj, pPV);
+                    SdrPageView* pPV = m_rView.GetSdrPageView();
+                    m_rView.MarkObj(pObj, pPV);
                 }
             } // if ( xObj.is() && xObj->getCurrentState() == embed::EmbedStates::UI_ACTIVE )
         }
@@ -516,7 +519,7 @@
 {
     bool bOverlapping = false;
     SdrViewEvent aVEvt;
-    bOverlapping = m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt) != SDRHIT_NONE;
+    bOverlapping = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONUP, aVEvt) != SDRHIT_NONE;
     if (bOverlapping && aVEvt.pObj)
     {
         colorizeOverlappedObject(aVEvt.pObj);
@@ -531,15 +534,15 @@
 // -----------------------------------------------------------------------------
 void DlgEdFunc::checkMovementAllowed(const MouseEvent& rMEvt)
 {
-    if ( m_pParent->getViewsWindow()->IsDragObj() )
+    if ( m_pParent->getSectionWindow()->getViewsWindow()->IsDragObj() )
     {
         if ( isRectangleHit(rMEvt) )
-            m_pParent->getViewsWindow()->BrkAction();
+            m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
         // object was dragged
         Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
         if (m_bSelectionMode)
         {
-            m_pParent->getViewsWindow()->EndAction();
+            m_pParent->getSectionWindow()->getViewsWindow()->EndAction();
         }
         else
         {
@@ -549,19 +552,19 @@
             {
                 aPnt.Y() = 0;
             }
-            m_pParent->getViewsWindow()->EndDragObj( bControlKeyPressed, m_pView, aPnt );
-        }
-        m_pParent->getViewsWindow()->ForceMarkedToAnotherPage();
+            m_pParent->getSectionWindow()->getViewsWindow()->EndDragObj( bControlKeyPressed, &m_rView, aPnt );
+        }
+        m_pParent->getSectionWindow()->getViewsWindow()->ForceMarkedToAnotherPage();
         m_pParent->Invalidate(INVALIDATE_CHILDREN);
     }
     else
-        m_pParent->getViewsWindow()->EndAction();
+        m_pParent->getSectionWindow()->getViewsWindow()->EndAction();
 }
 // -----------------------------------------------------------------------------
 bool DlgEdFunc::isOnlyCustomShapeMarked()
 {
     bool bReturn = true;
-    const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
+    const SdrMarkList& rMarkList = m_rView.GetMarkedObjectList();
     for (sal_uInt32 i =  0; i < rMarkList.GetMarkCount();++i )
     {
         SdrMark* pMark = rMarkList.GetMark(i);
@@ -585,13 +588,13 @@
     }

     SdrViewEvent aVEvt;
-    const SdrHitKind eHit = m_pView->PickAnything(rMEvt, SDRMOUSEMOVE, aVEvt);
+    const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEMOVE, aVEvt);
     bool bIsSetPoint = (eHit == SDRHIT_UNMARKEDOBJECT);
     if ( !bIsSetPoint )
     {
         // no drag rect, we have to check every single select rect
-        //const Rectangle& rRect = m_pView->GetDragStat().GetActionRect();
-        const SdrDragStat& rDragStat = m_pView->GetDragStat();
+        //const Rectangle& rRect = m_rView.GetDragStat().GetActionRect();
+        const SdrDragStat& rDragStat = m_rView.GetDragStat();
         if (rDragStat.GetDragMethod() != NULL)
         {
             SdrObjListIter aIter(*m_pParent->getPage(),IM_DEEPNOGROUPS);
@@ -599,7 +602,7 @@
             // loop through all marked objects and check if there new rect overlapps an old one.
             while( (pObjIter = aIter.Next()) != NULL && !bIsSetPoint)
             {
-                if ( m_pView->IsObjMarked(pObjIter)
+                if ( m_rView.IsObjMarked(pObjIter)
                      && dynamic_cast<OUnoObject*>(pObjIter) != NULL )
                 {
                     Rectangle aNewRect = pObjIter->GetLastBoundRect();
@@ -617,7 +620,7 @@
                         ::ResizeRect(aNewRect,rDragStat.GetRef1(),rDragStat.GetXFact(),rDragStat.GetYFact());

-                    SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),*m_pView,false,pObjIter);
+                    SdrObject* pObjOverlapped = isOver(aNewRect,*m_pParent->getPage(),m_rView,false,pObjIter);
                     bIsSetPoint = pObjOverlapped ? true : false;
                     if (pObjOverlapped && !m_bSelectionMode)
                     {
@@ -656,14 +659,14 @@
 DlgEdFuncInsert::DlgEdFuncInsert( OReportSection* _pParent ) :
     DlgEdFunc( _pParent )
 {
-    m_pParent->getView()->SetCreateMode( TRUE );
+    m_rView.SetCreateMode( TRUE );
 }

 //----------------------------------------------------------------------------

 DlgEdFuncInsert::~DlgEdFuncInsert()
 {
-    m_pParent->getView()->SetEditMode( TRUE );
+    m_rView.SetEditMode( TRUE );
 }

 //----------------------------------------------------------------------------
@@ -674,26 +677,26 @@
         return TRUE;

     SdrViewEvent aVEvt;
-    const SdrHitKind eHit = m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+    const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);

     if( eHit != SDRHIT_UNMARKEDOBJECT )
     {
         // if no action, create object
-        if ( !m_pParent->getViewsWindow()->IsAction() )
+        if ( !m_pParent->getSectionWindow()->getViewsWindow()->IsAction() )
         {
             deactivateOle(true);
-            if ( m_pParent->getViewsWindow()->HasSelection() )
-                m_pParent->getViewsWindow()->unmarkAllObjects(m_pView);
-            m_pView->BegCreateObj(m_aMDPos);
-            m_pParent->getViewsWindow()->createDefault();
+            if ( m_pParent->getSectionWindow()->getViewsWindow()->HasSelection() )
+                m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(&m_rView);
+            m_rView.BegCreateObj(m_aMDPos);
+            m_pParent->getSectionWindow()->getViewsWindow()->createDefault();
         }
     }
     else
     {
         if( !rMEvt.IsShift() )
-            m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
-
-        m_pParent->getViewsWindow()->BegMarkObj( m_aMDPos,m_pView );
+            m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
+
+        m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos,&m_rView );
     }

     return TRUE;
@@ -710,28 +713,28 @@

     BOOL bReturn = TRUE;
     // object creation active?
-    if ( m_pView->IsCreateObj() )
-    {
-        if ( isOver(m_pView->GetCreateObj(),*m_pParent->getPage(),*m_pView) )
-        {
-            m_pParent->getViewsWindow()->BrkAction();
+    if ( m_rView.IsCreateObj() )
+    {
+        if ( isOver(m_rView.GetCreateObj(),*m_pParent->getPage(),m_rView) )
+        {
+            m_pParent->getSectionWindow()->getViewsWindow()->BrkAction();
             // BrkAction disables the create mode
-            m_pView->SetCreateMode( TRUE );
+            m_rView.SetCreateMode( TRUE );
             return TRUE;
         }

-        m_pView->EndCreateObj(SDRCREATE_FORCEEND);
-
-        if ( !m_pView->AreObjectsMarked() )
-        {
-            m_pView->MarkObj(aPos, nHitLog);
-        }
-
-        bReturn = m_pView->AreObjectsMarked();
+        m_rView.EndCreateObj(SDRCREATE_FORCEEND);
+
+        if ( !m_rView.AreObjectsMarked() )
+        {
+            m_rView.MarkObj(aPos, nHitLog);
+        }
+
+        bReturn = m_rView.AreObjectsMarked();
         if ( bReturn )
         {
-            OReportController& rController = m_pParent->getViewsWindow()->getView()->getReportView()->getController();
-            const SdrMarkList& rMarkList = m_pView->GetMarkedObjectList();
+            OReportController& rController = m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
+            const SdrMarkList& rMarkList = m_rView.GetMarkedObjectList();
             for (sal_uInt32 i =  0; i < rMarkList.GetMarkCount();++i )
             {
                 SdrMark* pMark = rMarkList.GetMark(i);
@@ -747,20 +750,18 @@
     else
         checkMovementAllowed(rMEvt);

-    if ( m_pView && !m_pView->AreObjectsMarked() &&
+    if ( !m_rView.AreObjectsMarked() &&
          Abs(m_aMDPos.X() - aPos.X()) < nHitLog &&
          Abs(m_aMDPos.Y() - aPos.Y()) < nHitLog &&
          !rMEvt.IsShift() && !rMEvt.IsMod2() )
     {
-        SdrPageView* pPV = m_pView->GetSdrPageView();
+        SdrPageView* pPV = m_rView.GetSdrPageView();
         SdrViewEvent aVEvt;
-        m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
-        m_pView->MarkObj(aVEvt.pRootObj, pPV);
+        m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+        m_rView.MarkObj(aVEvt.pRootObj, pPV);
     } // ift() && !rMEvt.IsMod2() )
-
     checkTwoCklicks(rMEvt);
-
-    m_pParent->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_pView);
+    m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
     return bReturn;
 }

@@ -772,25 +773,25 @@
         return TRUE;
     const Point aPos( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );

-    if ( m_pView->IsCreateObj() )
-    {
-        m_pView->SetOrtho(SdrObjCustomShape::doConstructOrthogonal(m_pView->getSectionWindow()->getViewsWindow()->getShapeType()) ? !rMEvt.IsShift() : rMEvt.IsShift());
-        m_pView->SetAngleSnapEnabled(rMEvt.IsShift());
+    if ( m_rView.IsCreateObj() )
+    {
+        m_rView.SetOrtho(SdrObjCustomShape::doConstructOrthogonal(m_rView.getReportSection()->getSectionWindow()->getViewsWindow()->getShapeType()) ? !rMEvt.IsShift() : rMEvt.IsShift());
+        m_rView.SetAngleSnapEnabled(rMEvt.IsShift());
     }

     bool bIsSetPoint = false;
-    if ( m_pView->IsAction() )
+    if ( m_rView.IsAction() )
     {
         bIsSetPoint = setMovementPointer(rMEvt);
         ForceScroll(aPos);
-        m_pParent->getViewsWindow()->MovAction(aPos,m_pView, m_pView->GetDragMethod() == NULL, false);
-    }
-
-    //if ( isOver(m_pView->GetCreateObj(),*m_pParent->getPage(),*m_pView) )
+        m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPos,&m_rView, m_rView.GetDragMethod() == NULL, false);
+    }
+
+    //if ( isOver(m_rView.GetCreateObj(),*m_pParent->getPage(),*m_pView) )
     //    m_pParent->SetPointer( Pointer(POINTER_NOTALLOWED));
     //else
     if ( !bIsSetPoint )
-        m_pParent->SetPointer( m_pView->GetPreferedPointer( aPos, m_pParent) );
+        m_pParent->SetPointer( m_rView.GetPreferedPointer( aPos, m_pParent) );

     return TRUE;
 }
@@ -817,38 +818,38 @@
         return TRUE;

     SdrViewEvent aVEvt;
-    const SdrHitKind eHit = m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+    const SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
     if( eHit == SDRHIT_UNMARKEDOBJECT )
     {
         // if not multi selection, unmark all
         if ( !rMEvt.IsShift() )
-            m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
-
-        if ( m_pView->MarkObj(m_aMDPos) && rMEvt.IsLeft() )
+            m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
+
+        if ( m_rView.MarkObj(m_aMDPos) && rMEvt.IsLeft() )
         {
             // drag object
-            m_pParent->getViewsWindow()->BegDragObj(m_aMDPos, m_pView->PickHandle(m_aMDPos), m_pView);
+            m_pParent->getSectionWindow()->getViewsWindow()->BegDragObj(m_aMDPos, m_rView.PickHandle(m_aMDPos), &m_rView);
         }
         else
         {
             // select object
-            m_pParent->getViewsWindow()->BegMarkObj(m_aMDPos,m_pView);
+            m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj(m_aMDPos,&m_rView);
         }
     }
     else
     {
         if( !rMEvt.IsShift() )
-            m_pParent->getViewsWindow()->unmarkAllObjects(NULL);
-            //m_pView->UnmarkAll();
+            m_pParent->getSectionWindow()->getViewsWindow()->unmarkAllObjects(NULL);
+            //m_rView.UnmarkAll();

         if ( rMEvt.GetClicks() == 1 )
         {
             m_bSelectionMode = true;
-            m_pParent->getViewsWindow()->BegMarkObj( m_aMDPos ,m_pView);
+            m_pParent->getSectionWindow()->getViewsWindow()->BegMarkObj( m_aMDPos ,&m_rView);
         }
         else
         {
-            m_pView->SdrBeginTextEdit( aVEvt.pRootObj,m_pView->GetSdrPageView(),m_pParent,sal_False );
+            m_rView.SdrBeginTextEdit( aVEvt.pRootObj,m_rView.GetSdrPageView(),m_pParent,sal_False );
         }
     }

@@ -868,13 +869,13 @@
     if ( rMEvt.IsLeft() )                     // left mousebutton pressed
         checkMovementAllowed(rMEvt);

-    m_pParent->getViewsWindow()->EndAction();
-
+    m_pParent->getSectionWindow()->getViewsWindow()->EndAction();
     checkTwoCklicks(rMEvt);

-    m_pParent->SetPointer( m_pView->GetPreferedPointer( aPnt, m_pParent) );
+    m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) );
+
     if ( !m_bUiActive )
-        m_pParent->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_pView);
+        m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->UpdatePropertyBrowserDelayed(m_rView);
     m_bSelectionMode = false;
     return TRUE;
 }
@@ -889,24 +890,24 @@
     const Point aPnt( m_pParent->PixelToLogic( rMEvt.GetPosPixel() ) );
     bool bIsSetPoint = false;

-    if ( m_pView->IsAction() ) // Drag Mode
+    if ( m_rView.IsAction() ) // Drag Mode
     {
         bIsSetPoint = setMovementPointer(rMEvt);
         ForceScroll(aPnt);
-        if (m_pView->GetDragMethod()==NULL)
-        {
-            m_pParent->getViewsWindow()->MovAction(aPnt, m_pView, true, false);
+        if (m_rView.GetDragMethod()==NULL)
+        {
+            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, true, false);
         }
         else
         {
             bool bControlKey = rMEvt.IsMod1();
-            m_pParent->getViewsWindow()->MovAction(aPnt, m_pView, false, bControlKey);
+            m_pParent->getSectionWindow()->getViewsWindow()->MovAction(aPnt, &m_rView, false, bControlKey);
         }
     }

     if ( !bIsSetPoint )
     {
-        m_pParent->SetPointer( m_pView->GetPreferedPointer( aPnt, m_pParent) );
+        m_pParent->SetPointer( m_rView.GetPreferedPointer( aPnt, m_pParent) );

         // restore color
         unColorizeOverlappedObj();
@@ -918,17 +919,17 @@
 //void DlgEdFuncSelect::SetInEditMode(SdrTextObj* _pTextObj,const MouseEvent& rMEvt, BOOL bQuickDrag)
 //{
 //
-//  SdrPageView* pPV = m_pView->GetSdrPageView();
+//  SdrPageView* pPV = m_rView.GetSdrPageView();
 //  if( _pTextObj && _pTextObj->GetPage() == pPV->GetPage() )
 //  {
-//      m_pView->SetCurrentObj(OBJ_TEXT);
-//      m_pView->SetEditMode(SDREDITMODE_EDIT);
+//      m_rView.SetCurrentObj(OBJ_TEXT);
+//      m_rView.SetEditMode(SDREDITMODE_EDIT);
 //
 //      BOOL bEmptyOutliner = FALSE;
 //
-//      if (!_pTextObj->GetOutlinerParaObject() && m_pView->GetTextEditOutliner())
+//      if (!_pTextObj->GetOutlinerParaObject() && m_rView.GetTextEditOutliner())
 //      {
-//          ::SdrOutliner* pOutl = m_pView->GetTextEditOutliner();
+//          ::SdrOutliner* pOutl = m_rView.GetTextEditOutliner();
 //          ULONG nParaAnz = pOutl->GetParagraphCount();
 //          Paragraph* p1stPara = pOutl->GetParagraph( 0 );
 //
@@ -942,7 +943,7 @@
 //          }
 //      }
 //
-//      if (_pTextObj != m_pView->GetTextEditObject() || bEmptyOutliner)
+//      if (_pTextObj != m_rView.GetTextEditObject() || bEmptyOutliner)
 //      {
 //          UINT32 nInv = _pTextObj->GetObjInventor();
 //          UINT16 nSdrObjKind = _pTextObj->GetObjIdentifier();
@@ -993,7 +994,7 @@
 //
 //              if (bEmptyOutliner)
 //              {
-//                  m_pView->SdrEndTextEdit(sal_True);
+//                  m_rView.SdrEndTextEdit(sal_True);
 //              }
 //
 //              if( _pTextObj )
@@ -1005,17 +1006,17 @@
 //                      pOutl->SetVertical( TRUE );
 //
 //
-//                  if (m_pView->SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
+//                  if (m_rView.SdrBeginTextEdit(_pTextObj, pPV, pParent, sal_True, pOutl) && _pTextObj->GetObjInventor() == SdrInventor)
 //                  {
 //                      //bFirstObjCreated = TRUE;
 //                      //DeleteDefaultText();
 //
-//                      OutlinerView* pOLV = m_pView->GetTextEditOutlinerView();
+//                      OutlinerView* pOLV = m_rView.GetTextEditOutlinerView();
 //
 //                      nSdrObjKind = _pTextObj->GetObjIdentifier();
 //
 //                      SdrViewEvent aVEvt;
-//                      SdrHitKind eHit = m_pView->PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
+//                      SdrHitKind eHit = m_rView.PickAnything(rMEvt, SDRMOUSEBUTTONDOWN, aVEvt);
 //
 //                      if (eHit == SDRHIT_TEXTEDIT)
 //                      {


IsVisible dans le deuxieme constructeur de Component

--- Component.cpp
+++ Component.cpp
@@ -10,6 +10,7 @@
 }
 Component::Component(float x, float y, float z)
 	: position(x, y, z)
+	, isVisible(true)
 {
 	components.push_back(this);
 }


mdb error handling

mdb error handling

--- src/logjoin/LogJoin.cc
+++ src/logjoin/LogJoin.cc
@@ -248,11 +248,11 @@
     const std::string uid,
     UnixTime stream_time,
     mdb::MDBTransaction* txn) {
+  TrackedSession session;
+  session.uuid = SHA1::compute(uid).toString();
+
   auto cursor = txn->getCursor();
-
   try {
-    TrackedSession session;
-    session.uuid = SHA1::compute(uid).toString();

     Buffer key;
     Buffer value;


fixed typo

fixed typo

--- Library/Sources/Stroika/Frameworks/SystemPerformance/Instruments/Process.cpp
+++ Library/Sources/Stroika/Frameworks/SystemPerformance/Instruments/Process.cpp
@@ -550,7 +550,7 @@
             return results;
         }
         template    <typename T>
-        Optional<T> OptionallyReadIfFileExists_ (const String& fullPath, const function<T(const Streams::BinaryInputStream&)>& reader)
+        Optional<T> OptionallyReadIfFileExists_ (const String& fullPath, const function<T(const Streams::BinaryInputStream<>&)>& reader)
         {
             if (IO::FileSystem::FileSystem::Default ().Access (fullPath)) {
                 IgnoreExceptionsExceptThreadAbortForCall (return reader (BinaryFileInputStream::mk (fullPath, BinaryFileInputStream::eNotSeekable)));


update api name

update api name

--- GR/core/ip_address.hpp
+++ GR/core/ip_address.hpp
@@ -154,7 +154,7 @@
 			@return 文字列
 		*/
 		//-----------------------------------------------------------------//
-		const char* get_str(char spch = '.') {
+		const char* c_str(char spch = '.') {
 			utils::format("%d%c%d%c%d%c%d", str_, sizeof(str_))
 				% static_cast<int>(address_.bytes[0]) % spch
 				% static_cast<int>(address_.bytes[1]) % spch


(unstable) [changed] Removed lingering debug check

git-svn-id: e4cf3396f21da4a5d638eecf7e3b4dd52b27f938@6118 c3d1530f-68f5-4bd0-87dc-8ef779617e40

--- MMOCoreORB/src/server/zone/managers/auction/AuctionManagerImplementation.cpp
+++ MMOCoreORB/src/server/zone/managers/auction/AuctionManagerImplementation.cpp
@@ -616,7 +616,6 @@

 	if(city != NULL && !city->isClientRegion() && tax){
-		city->isClientRegion();
 		Locker clock(city);
 		city->addToCityTreasury(tax);
 	}


Add testing for Image::IsUnique

Add testing for Image::IsUnique

--- Testing/Unit/sitkImageTests.cxx
+++ Testing/Unit/sitkImageTests.cxx
@@ -465,41 +465,51 @@
 sitkClangWarningIgnore("-Wself-assign-overloaded");
 TEST_F(Image, CopyOnWrite)
 {
-  // test that a just constructed image only have 1 referecne
+  // test that a just constructed image only have 1 reference
   sitk::Image img( 10, 10, sitk::sitkInt16 );
   EXPECT_EQ(static_cast<const sitk::Image *>(&img)->GetITKBase()->GetReferenceCount(), 1 )
     << " Reference Count for just constructed Image";
+  EXPECT_TRUE(img.IsUnique());

   // use the image from the fixture to test some copy constructor
   EXPECT_EQ(static_cast<const sitk::Image *>(shortImage.get())->GetITKBase()->GetReferenceCount(), 2 )
     << " Reference Count for shared shortImage initial";
+  EXPECT_FALSE(shortImage->IsUnique());
   sitk::Image img0 = *shortImage;
   EXPECT_EQ(static_cast<const sitk::Image *>(shortImage.get())->GetITKBase()->GetReferenceCount(), 3 )
     << " Reference Count for shared shortImage copy";
+  EXPECT_FALSE(shortImage->IsUnique());
   sitk::Image imgCopy = img0;
   EXPECT_EQ(static_cast<const sitk::Image *>(shortImage.get())->GetITKBase()->GetReferenceCount(), 4 )
     << " Reference Count for shared shortImage second copy";
+  EXPECT_FALSE(shortImage->IsUnique());

   // check set origin for copy on write
   imgCopy.SetOrigin( std::vector<double>( 3, 2.123 ) );
   EXPECT_EQ(static_cast<const sitk::Image *>(&imgCopy)->GetITKBase()->GetReferenceCount(), 1 )
     << " Reference Count for copy after set origin";
+  EXPECT_TRUE(imgCopy.IsUnique());
   EXPECT_EQ(static_cast<const sitk::Image *>(&img0)->GetITKBase()->GetReferenceCount(), 3 )
     << " Reference Count for shared after set origin";
+  EXPECT_FALSE(img0.IsUnique());

   // check shallow copy on assignment
   imgCopy = img0;
   EXPECT_EQ(static_cast<const sitk::Image *>(&imgCopy)->GetITKBase()->GetReferenceCount(), 4 )
     << " Reference Count for copy after assigment";
+  EXPECT_FALSE(imgCopy.IsUnique());
   EXPECT_EQ(static_cast<const sitk::Image *>(&img0)->GetITKBase()->GetReferenceCount(), 4 )
     << " Reference Count for shared after assignment";
+  EXPECT_FALSE(img0.IsUnique());

   // check copy on write with set spacing
   imgCopy.SetSpacing( std::vector<double>( 3, 3.45 ) );
   EXPECT_EQ(static_cast<const sitk::Image *>(&imgCopy)->GetITKBase()->GetReferenceCount(), 1 )
     << " Reference Count for copy after set spacing";
+  EXPECT_TRUE(imgCopy.IsUnique());
   EXPECT_EQ(static_cast<const sitk::Image *>(&img0)->GetITKBase()->GetReferenceCount(), 3 )
     << " Reference Count for shared after set spacing";
+  EXPECT_FALSE(img0.IsUnique());
   EXPECT_EQ( sitk::Hash( imgCopy ), sitk::Hash( img0 ) ) << "Hash for shared and copy after set spacing";
 }


[fixed] zone loading

[fixed] zone loading

git-svn-id: c34995188cc7e843f8a799edec2d9d4b36f36456@3127 c3d1530f-68f5-4bd0-87dc-8ef779617e40

--- MMOCoreORB/src/server/zone/objects/building/BuildingObjectImplementation.cpp
+++ MMOCoreORB/src/server/zone/objects/building/BuildingObjectImplementation.cpp
@@ -214,8 +214,8 @@
 	for (int i = 0; i < inRangeObjectCount(); ++i) {
 		QuadTreeEntry* obj = getInRangeObject(i);

-		object->addInRangeObject(obj, true);
-		obj->addInRangeObject(object, true);
+		object->addInRangeObject(obj, false);
+		obj->addInRangeObject(object, false);
 	}

 	for (int i = 0; i < cells.size(); ++i) {


BUG: InputImageParameter check for existing output caster

--- Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
+++ Modules/Wrappers/ApplicationEngine/include/otbWrapperInputImageParameter.hxx
@@ -176,6 +176,12 @@
       }
     else
     {
+        if (m_OutputCaster.IsNotNull())
+        {
+          itkExceptionMacro(
+              "GetImage() was already called with a different type, "
+              "probably due to two calls to GetParameter<Type>Image with different types in application code.");
+        }
       CLAMP_IMAGE_BASE( TImageType, m_Image.GetPointer() );
     }
   }


INTEGRATION: CWS pchfix02 (1.7.36); FILE MERGED 2006/09/01 17:35:36 kaib 1.7.36.1: #i68856# Added header markers and pch files

--- scripting/source/provider/ScriptingContext.cxx
+++ scripting/source/provider/ScriptingContext.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: ScriptingContext.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-09 02:31:14 $
+ *  last change: $Author: obo $ $Date: 2006-09-16 12:29:15 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -32,6 +32,9 @@
  *    MA  02111-1307  USA
  *
  ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_scripting.hxx"
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/frame/XModel.hpp>


BUG: Cutting rectilinear grids not working in parallel.

--- Graphics/vtkCutter.cxx
+++ Graphics/vtkCutter.cxx
@@ -40,7 +40,7 @@

 #include <math.h>

-vtkCxxRevisionMacro(vtkCutter, "1.83");
+vtkCxxRevisionMacro(vtkCutter, "1.84");
 vtkStandardNewMacro(vtkCutter);
 vtkCxxSetObjectMacro(vtkCutter,CutFunction,vtkImplicitFunction);

@@ -292,12 +292,6 @@
   this->RectilinearSynchronizedTemplates->ComputeScalarsOff();
   this->RectilinearSynchronizedTemplates->ComputeNormalsOff();
   output = this->RectilinearSynchronizedTemplates->GetOutput();
-  output->SetUpdateNumberOfPieces(
-    outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_PIECES()));
-  output->SetUpdatePiece(
-    outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_PIECE_NUMBER()));
-  output->SetUpdateGhostLevel(
-    outInfo->Get(vtkStreamingDemandDrivenPipeline::UPDATE_NUMBER_OF_GHOST_LEVELS()));
   this->RectilinearSynchronizedTemplates->Update();
   output->Register(this);


Clean out some dead code.

Clean out some dead code.

--- Connection.cc
+++ Connection.cc
@@ -234,12 +234,6 @@
   while (1) {
     switch (write_state) {
     case INIT_WRITE:
-      /*
-      if (options.iadist == EXPONENTIAL)
-        delay = generate_poisson(options.lambda);
-      else
-        delay = generate_uniform(options.lambda);
-      */
       delay = iagen->generate();

       next_time = now + delay;
@@ -262,12 +256,6 @@
       issue_something(now);
       stats.log_op(op_queue.size());

-      /*
-      if (options.iadist == EXPONENTIAL)
-        next_time += generate_poisson(options.lambda);
-      else
-        next_time += generate_uniform(options.lambda);
-      */
       next_time += iagen->generate();

       break;


Port https://codereview.chromium.org/338523002/ to blink.

BUG=288948
R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/418243005

git-svn-id: bf5cd6ccde378db821296732a091cfbcf5285fbd@179327 bbb929c8-8fbe-4397-9dbb-9b2b20218538

--- Source/wtf/dtoa.cpp
+++ Source/wtf/dtoa.cpp
@@ -44,13 +44,6 @@
 #pragma warning(disable: 4244)
 #pragma warning(disable: 4245)
 #pragma warning(disable: 4554)
-
-#if _MSC_VER == 1800
-// TODO(scottmg): VS2013 currently ICEs on a bunch of functions in this file.
-// Upstream bug fixed in next release. See http://crbug.com/288498.
-#pragma optimize("", off)
-#endif
-
 #endif

 namespace WTF {


INTEGRATION: CWS ooo19126 (1.3.434); FILE MERGED 2005/09/05 17:34:49 rt 1.3.434.1: #i54170# Change license header: remove SISSL

--- dbaccess/source/ui/inc/directsql.hxx
+++ dbaccess/source/ui/inc/directsql.hxx
@@ -1,61 +1,35 @@
 /*************************************************************************
+ *
+ *  OpenOffice.org - a multi-platform office productivity suite
  *
  *  $RCSfile: directsql.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-19 17:52:39 $
+ *  last change: $Author: rt $ $Date: 2005-09-08 15:52:11 $
  *
- *  The Contents of this file are made available subject to the terms of
- *  either of the following licenses
- *
- *         - GNU Lesser General Public License Version 2.1
- *         - Sun Industry Standards Source License Version 1.1
- *
- *  Sun Microsystems Inc., October, 2000
- *
- *  GNU Lesser General Public License Version 2.1
- *  =============================================
- *  Copyright 2000 by Sun Microsystems, Inc.
- *  901 San Antonio Road, Palo Alto, CA 94303, USA
- *
- *  This library is free software; you can redistribute it and/or
- *  modify it under the terms of the GNU Lesser General Public
- *  License version 2.1, as published by the Free Software Foundation.
- *
- *  This library is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  Lesser General Public License for more details.
- *
- *  You should have received a copy of the GNU Lesser General Public
- *  License along with this library; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- *  MA  02111-1307  USA
+ *  The Contents of this file are made available subject to
+ *  the terms of GNU Lesser General Public License Version 2.1.
  *
  *
- *  Sun Industry Standards Source License Version 1.1
- *  =================================================
- *  The contents of this file are subject to the Sun Industry Standards
- *  Source License Version 1.1 (the "License"); You may not use this file
- *  except in compliance with the License. You may obtain a copy of the
- *  License at http://www.openoffice.org/license.html.
+ *    GNU Lesser General Public License Version 2.1
+ *    =============================================
+ *    Copyright 2005 by Sun Microsystems, Inc.
+ *    901 San Antonio Road, Palo Alto, CA 94303, USA
  *
- *  Software provided under this License is provided on an "AS IS" basis,
- *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESS OR IMPLIED, INCLUDING,
- *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
- *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
- *  See the License for the specific provisions governing your rights and
- *  obligations concerning the Software.
+ *    This library is free software; you can redistribute it and/or
+ *    modify it under the terms of the GNU Lesser General Public
+ *    License version 2.1, as published by the Free Software Foundation.
  *
- *  The Initial Developer of the Original Code is: Sun Microsystems, Inc..
+ *    This library is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *    Lesser General Public License for more details.
  *
- *  Copyright: 2000 by Sun Microsystems, Inc.
- *
- *  All Rights Reserved.
- *
- *  Contributor(s): _______________________________________
- *
+ *    You should have received a copy of the GNU Lesser General Public
+ *    License along with this library; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *    MA  02111-1307  USA
  *
  ************************************************************************/


Implement set[Float|Double]. (firebird-sdbc)

This commit somehow got lost on my old computer, so here it is
recreated.

Change-Id: Ib4001a21c92976fe0e3dea3778360ff67cbfa3a9

--- connectivity/source/drivers/firebird/ResultSet.cxx
+++ connectivity/source/drivers/firebird/ResultSet.cxx
@@ -482,17 +482,13 @@
 float SAL_CALL OResultSet::getFloat(sal_Int32 columnIndex)
     throw(SQLException, RuntimeException)
 {
-    (void) columnIndex;
-    return 0.0f; // TODO: implement
-//     return safelyRetrieveValue(columnIndex);
+    return safelyRetrieveValue< float >(columnIndex);
 }

 double SAL_CALL OResultSet::getDouble(sal_Int32 columnIndex)
     throw(SQLException, RuntimeException)
 {
-    (void) columnIndex;
-    return 0.0; // TODO: implement
-//     return safelyRetrieveValue(columnIndex);
+    return safelyRetrieveValue< double >(columnIndex);
 }

 // ---- XRow: More complex types ----------------------------------------------


INTEGRATION: CWS dba203c (1.8.110); FILE MERGED 2006/03/29 11:35:43 fs 1.8.110.1: #133638# renamed ambiguous ::dbui::OLocalResourceAccess to LocalresourceAccess

--- dbaccess/source/ui/misc/charsets.cxx
+++ dbaccess/source/ui/misc/charsets.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: charsets.cxx,v $
  *
- *  $Revision: 1.8 $
- *
- *  last change: $Author: rt $ $Date: 2005-09-08 16:11:47 $
+ *  $Revision: 1.9 $
+ *
+ *  last change: $Author: rt $ $Date: 2006-05-04 08:45:40 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -70,7 +70,7 @@
         ,SvxTextEncodingTable()
     {
         {
-            OLocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE );
+            LocalResourceAccess aCharsetStrings( RSC_CHARSETS, RSC_RESOURCE );
             m_aSystemDisplayName = String( ResId( 1 ) );
         }
     }


tested support of domain input

tested support of domain input

--- Core/main.cpp
+++ Core/main.cpp
@@ -71,6 +71,9 @@
 				help();
 				return 0;
 			}
+			else {
+				*pointer += argv[i];
+			}
 		}
 	}

@@ -78,6 +81,9 @@
 		cout <<"WARNING: you should not use the -p flag as it may be insecure" << endl;
 	}

+
+	cout << "domain is: " << domain << endl;
+	cout << "password is: " << password << endl;
 	getPassword ("harvy","dent");

 	cout << "DONE!" << endl;