that went suprisingly well

that went suprisingly well

--- pymaprdb.cc
+++ pymaprdb.cc
@@ -12,12 +12,6 @@
 #define __WINDOWS__
 #endif

-#define CHECK_RC_RETURN(rc)          \
-    do {                               \
-        if (rc) {                        \
-            printf("%s:%d Call failed: %d\n", __PRETTY_FUNCTION__, __LINE__, rc); \
-        }                                \
-    } while (0);

 #define OOM_OBJ_RETURN_NULL(obj) \
     do {                        \
@@ -467,7 +461,9 @@
     if (!self->is_open) {
         int err = 0;
         err = hb_connection_create(PyString_AsString(self->cldbs), NULL, &self->conn);
-        OOM_OBJ_RETURN_NULL(self->conn);
+        //OOM_OBJ_RETURN_NULL(self->conn);
+        // TODO Oh wow cldbs is null if the user provided string is invalid...
+        // I need to remove all the OOM checks then
         if (err != 0) {
             PyErr_Format(PyExc_ValueError, "Could not connect using CLDBS '%s': %i", self->cldbs, err);
             return NULL;
@@ -694,7 +690,7 @@
         // Sometimes if it fails to create, the table still gets created but doesn't work?
         // Attempt to delete it
         PyObject *table_name_obj = Py_BuildValue("(s)", table_name);
-        OOM_ERRNO_RETURN_NULL(table_name_obj);
+        OOM_OBJ_RETURN_NULL(table_name_obj);

         // I don't care if this succeeds or not
         Connection_delete_table(self, table_name_obj);
@@ -1147,7 +1143,7 @@
     // TODO should I add a buffer to *ctx anddo something with it
 }

-*/
+
 /*
 import spam
 connection = spam._connection("hdnprd-c01-r03-01:7222,hdnprd-c01-r04-01:7222,hdnprd-c01-r05-01:7222")
@@ -1385,7 +1381,7 @@
     OOM_OBJ_RETURN_NULL(call_back_buffer);

     hb_put_t hb_put;
-    err = make_put(self, rowBuf, row_key, dict, &hb_put);
+    err = make_put(self, row_buf, row_key, dict, &hb_put);
     OOM_OBJ_RETURN_NULL(hb_put);
     if (err != 0) {
         // This would just override the error message set in make_put
@@ -1770,7 +1766,7 @@

     RowBuffer *row_buf = new RowBuffer();
-    OOM_OBJ_RETURN_NULL(rowBuf);
+    OOM_OBJ_RETURN_NULL(row_buf);

     CallBackBuffer *call_back_buffer = new CallBackBuffer(self, row_buf, NULL);
     OOM_OBJ_RETURN_NULL(call_back_buffer);
@@ -2162,118 +2158,6 @@
    PyType_GenericNew,                         /* tp_new */
 };

-/*
-struct Connection {
-    hb_connection_t conn;
-    hb_client_t client;
-    RowBuffer *rowBuf;
-
-    Connection() {
-        rowBuf = new RowBuffer();
-        int err = 0;
-        err = hb_connection_create(cldbs, NULL, &conn);
-        CHECK_RC_RETURN(err);
-
-        err = hb_client_create(conn, &client);
-        CHECK_RC_RETURN(err);
-    }
-
-    ~Connection() {
-        hb_client_destroy(client, cl_dsc_cb, rowBuf);
-        hb_connection_destroy(conn);
-    }
-
-};
-*/
-
-/*
-static void read_result(hb_result_t result) {
-    if (!result) {
-        return;
-    }
-
-    size_t cellCount = 0;
-    hb_result_get_cell_count(result, &cellCount);
-
-    for (size_t i = 0; i < cellCount; ++i) {
-        const hb_cell_t *cell;
-        hb_result_get_cell_at(result, i, &cell);
-        printf("%s:%s = %s\t", cell->family, cell->qualifier, cell->value);
-    }
-
-    if (cellCount == 0) {
-        printf("----- NO CELLS -----");
-    }
-}
-*/
-
-
-
-
-
-
-
-
-
-
-/*
-static PyObject *pymaprdb_get(Connection *connection,const char *table_name, char *row_key) {
-    printf("Inside pymaprdb_get\n");
-    //RowBuffer *rowBuf = new RowBuffer();
-    //char *rk = rowBuf->getBuffer(1024);
-    char *rk = connection->rowBuf->getBuffer(1024);
-    //char rk[1024];
-    // Both of those work^ I wonder why they use the row buffer?
-
-    //printf("Enter key to get: ");
-    //scanf("%s", rk);
-    strcpy(rk, row_key);
-    printf("In test_get after strcpy, rowkey is %s\n", connection->rowBuf->allocedBufs.back());
-
-
-    //hb_connection_t conn;
-    int err = 0;
-
-
-    //if (!user) {
-        //err = hb_connection_create(cldbs, NULL, &conn);
-        //CHECK_RC_RETURN(err);
-    //} else {
-    //    err = hb_connection_create_as_user(cldbs, NULL, user, &conn);
-    //    CHECK_RC_RETURN(err);
-    //}
-
-    //hb_client_t client;
-
-    //err = hb_client_create(conn, &client);
-    //CHECK_RC_RETURN(err);
-
-    hb_get_t get;
-    err = hb_get_create((const byte_t *)rk, strlen(rk) + 1, &get);
-    CHECK_RC_RETURN(err);
-
-    //err = hb_get_set_table(get, tableName, strlen(tableName));
-    err = hb_get_set_table(get, table_name, strlen(table_name));
-    CHECK_RC_RETURN(err);
-
-
-    count = 0;
-    //err = hb_get_send(client, get, get_send_cb, rowBuf);
-    err = hb_get_send(connection->client, get, get_send_cb, connection->rowBuf);
-    CHECK_RC_RETURN(err);
-
-    while (count != 1) { sleep(0.1); }
-
-    hb_client_destroy(connection->client, cl_dsc_cb, connection);
-
-    //sleep(1);
-    //hb_connection_destroy(conn);
-
-    printf("Done with test_get\n");
-    return connection->rowBuf->ret;
-}
-*/
-

@@ -2339,79 +2223,7 @@
 spam.scan()
 */

-/*
-
-
-static PyObject *scan(PyObject *self, PyObject *args) {
-    char *start = NULL;
-    char *stop = NULL;
-
-    RowBuffer *rowBuf = new RowBuffer();
-    rowBuf->rets = PyList_New(0);
-
-    if (!PyArg_ParseTuple(args, "|ss", &start, &stop)) {
-        return NULL;
-    }
-
-    hb_connection_t conn;
-    int err = 0;
-    err = hb_connection_create(cldbs, NULL, &conn);
-    CHECK_RC_RETURN(err);
-    printf("RC for conn create was %i\n", err);
-    hb_client_t client;
-    err = hb_client_create(conn, &client);
-    CHECK_RC_RETURN(err);
-    printf("RC for client create was %i\n", err);
-
-    hb_scanner_t scan;
-    err = hb_scanner_create(client, &scan);
-    CHECK_RC_RETURN(err);
-    printf("RC for scanner create was %i\n", err);
-
-    err = hb_scanner_set_table(scan, tableName, strlen(tableName));
-    CHECK_RC_RETURN(err);
-    printf("RC for set table was %i\n", err);
-
-    err = hb_scanner_set_num_versions(scan, 1);
-    CHECK_RC_RETURN(err);
-    printf("RC for num versions  was %i\n", err);
-
-    if (start) {
-        // Do I need strlen + 1 ?
-        err = hb_scanner_set_start_row(scan, (byte_t *) start, strlen(start));
-        CHECK_RC_RETURN(err);
-        printf("RC for start row  was %i\n", err);
-    }
-    if (stop) {
-        err = hb_scanner_set_end_row(scan, (byte_t *) stop, strlen(stop));
-        CHECK_RC_RETURN(err);
-        printf("RC for stop row  was %i\n", err);
-    }
-
-    // Does it optimize if I set this higher?
-    err = hb_scanner_set_num_max_rows(scan, 1);
-    CHECK_RC_RETURN(err);
-    printf("RC for set num max rows  was %i\n", err);
-
-    count = 0;
-    err = hb_scanner_next(scan, sn_cb, rowBuf);
-    CHECK_RC_RETURN(err);
-    printf("RC for scanner next  was %i\n", err);
-
-    while (count == 0) { sleep(0.1); }
-
-    err = hb_client_destroy(client, cl_dsc_cb, NULL);
-    CHECK_RC_RETURN(err);
-    printf("RC for client destroy  was %i\n", err);
-
-
-    err = hb_connection_destroy(conn);
-    CHECK_RC_RETURN(err);
-    printf("RC for connection destroy  was %i\n", err);
-
-    return rowBuf->rets;
-}
-*/
+

 static PyObject *build_int(PyObject *self, PyObject *args) {
     return Py_BuildValue("i", 123);


INTEGRATION: CWS calcuno01 (1.36.76); FILE MERGED 2004/10/13 12:41:22 sab 1.36.76.3: RESYNC: (1.36-1.38); FILE MERGED 2004/02/12 17:17:21 sab 1.36.76.2: #i22706#; set start value for ValidationIndex 2004/01/05 11:55:34 sab 1.36.76.1: #i22706#; improve API using

--- sc/source/filter/xml/XMLExportIterator.cxx
+++ sc/source/filter/xml/XMLExportIterator.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMLExportIterator.cxx,v $
  *
- *  $Revision: 1.38 $
- *
- *  last change: $Author: hr $ $Date: 2004-09-08 13:48:59 $
+ *  $Revision: 1.39 $
+ *
+ *  last change: $Author: vg $ $Date: 2005-03-23 12:50:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,14 @@
 #ifndef _COM_SUN_STAR_SHEET_XCELLADDRESSABLE_HPP_
 #include <com/sun/star/sheet/XCellAddressable.hpp>
 #endif
-#ifndef _COM_SUN_STAR_SHEET_XCELLRANGESQUERY_HPP_
-#include <com/sun/star/sheet/XCellRangesQuery.hpp>
-#endif
 #ifndef _COM_SUN_STAR_SHEET_CELLFLAGS_HPP_
 #include <com/sun/star/sheet/CellFlags.hpp>
 #endif
 #ifndef _COM_SUN_STAR_SHEET_XSHEETANNOTATIONSSUPPLIER_HPP_
 #include <com/sun/star/sheet/XSheetAnnotationsSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_CONTAINER_XENUMERATIONACCESS_HPP_
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #endif

 #ifndef _TOOLS_DEBUG_HXX
@@ -167,7 +167,7 @@

 sal_Bool ScMyShapesContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aShapeList.empty() )
     {
         ScUnoConversion::FillApiAddress( rCellAddress, aShapeList.begin()->aAddress );
@@ -182,8 +182,9 @@
     ScAddress aAddress;
     ScUnoConversion::FillScAddress( aAddress, rMyCell.aCellAddress );

-    ScMyShapeList::iterator aItr = aShapeList.begin();
-    while( (aItr != aShapeList.end()) && (aItr->aAddress == aAddress) )
+    ScMyShapeList::iterator aItr(aShapeList.begin());
+    ScMyShapeList::iterator aEndItr(aShapeList.end());
+    while( (aItr != aEndItr) && (aItr->aAddress == aAddress) )
     {
         rMyCell.aShapeList.push_back(*aItr);
         aItr = aShapeList.erase(aItr);
@@ -274,8 +275,8 @@

 void ScMyMergedRangesContainer::AddRange(const table::CellRangeAddress aMergedRange)
 {
-    sal_Int32 nStartRow = aMergedRange.StartRow;
-    sal_Int32 nEndRow = aMergedRange.EndRow;
+    sal_Int32 nStartRow(aMergedRange.StartRow);
+    sal_Int32 nEndRow(aMergedRange.EndRow);

     ScMyMergedRange aRange;
     aRange.bIsFirst = sal_True;
@@ -286,7 +287,7 @@

     aRange.bIsFirst = sal_False;
     aRange.nRows = 0;
-    for( sal_Int32 nRow = nStartRow + 1; nRow <= nEndRow; nRow++ )
+    for( sal_Int32 nRow = nStartRow + 1; nRow <= nEndRow; ++nRow )
     {
         aRange.aCellRange.StartRow = aRange.aCellRange.EndRow = nRow;
         aRangeList.push_back(aRange);
@@ -295,7 +296,7 @@

 sal_Bool ScMyMergedRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aRangeList.empty() )
     {
         ScUnoConversion::FillApiStartAddress( rCellAddress, aRangeList.begin()->aCellRange );
@@ -307,7 +308,7 @@
 void ScMyMergedRangesContainer::SetCellData( ScMyCell& rMyCell )
 {
     rMyCell.bIsMergedBase = rMyCell.bIsCovered = sal_False;
-    ScMyMergedRangeList::iterator aItr = aRangeList.begin();
+    ScMyMergedRangeList::iterator aItr(aRangeList.begin());
     if( aItr != aRangeList.end() )
     {
         table::CellAddress aFirstAddress;
@@ -321,7 +322,7 @@
             rMyCell.bIsCovered = !aItr->bIsFirst;
             if( aItr->aCellRange.StartColumn < aItr->aCellRange.EndColumn )
             {
-                aItr->aCellRange.StartColumn++;
+                ++(aItr->aCellRange.StartColumn);
                 aItr->bIsFirst = sal_False;
             }
             else
@@ -367,7 +368,7 @@

 sal_Bool ScMyAreaLinksContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aAreaLinkList.empty() )
     {
         ScUnoConversion::FillApiStartAddress( rCellAddress, aAreaLinkList.begin()->aDestRange );
@@ -379,7 +380,7 @@
 void ScMyAreaLinksContainer::SetCellData( ScMyCell& rMyCell )
 {
     rMyCell.bHasAreaLink = sal_False;
-    ScMyAreaLinkList::iterator aItr = aAreaLinkList.begin();
+    ScMyAreaLinkList::iterator aItr(aAreaLinkList.begin());
     if( aItr != aAreaLinkList.end() )
     {
         table::CellAddress aAddress;
@@ -426,10 +427,10 @@

 void ScMyEmptyDatabaseRangesContainer::AddNewEmptyDatabaseRange(const table::CellRangeAddress& aCellRange)
 {
-    sal_Int32 nStartRow = aCellRange.StartRow;
-    sal_Int32 nEndRow = aCellRange.EndRow;
+    sal_Int32 nStartRow(aCellRange.StartRow);
+    sal_Int32 nEndRow(aCellRange.EndRow);
     ScMyCellRangeAddress aRange( aCellRange );
-    for( sal_Int32 nRow = nStartRow; nRow <= nEndRow; nRow++ )
+    for( sal_Int32 nRow = nStartRow; nRow <= nEndRow; ++nRow )
     {
         aRange.StartRow = aRange.EndRow = nRow;
         aDatabaseList.push_back( aRange );
@@ -438,7 +439,7 @@

 sal_Bool ScMyEmptyDatabaseRangesContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aDatabaseList.empty() )
     {
         ScUnoConversion::FillApiStartAddress( rCellAddress, *(aDatabaseList.begin()) );
@@ -450,8 +451,8 @@
 void ScMyEmptyDatabaseRangesContainer::SetCellData( ScMyCell& rMyCell )
 {
     rMyCell.bHasEmptyDatabase = sal_False;
-    sal_Int32 nTable = rMyCell.aCellAddress.Sheet;
-    ScMyEmptyDatabaseRangeList::iterator aItr = aDatabaseList.begin();
+    sal_Int32 nTable(rMyCell.aCellAddress.Sheet);
+    ScMyEmptyDatabaseRangeList::iterator aItr(aDatabaseList.begin());
     if( aItr != aDatabaseList.end() )
     {
         table::CellAddress aFirstAddress;
@@ -460,7 +461,7 @@
         {
             rMyCell.bHasEmptyDatabase = sal_True;
             if( aItr->StartColumn < aItr->EndColumn )
-                aItr->StartColumn++;
+                ++(aItr->StartColumn);
             else
                 aDatabaseList.erase(aItr);
         }
@@ -526,7 +527,7 @@

 sal_Bool ScMyDetectiveObjContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aDetectiveObjList.empty() )
     {
         rCellAddress = aDetectiveObjList.begin()->aPosition;
@@ -538,8 +539,9 @@
 void ScMyDetectiveObjContainer::SetCellData( ScMyCell& rMyCell )
 {
     rMyCell.aDetectiveObjVec.clear();
-    ScMyDetectiveObjList::iterator aItr = aDetectiveObjList.begin();
-    while( (aItr != aDetectiveObjList.end()) && (aItr->aPosition == rMyCell.aCellAddress) )
+    ScMyDetectiveObjList::iterator aItr(aDetectiveObjList.begin());
+    ScMyDetectiveObjList::iterator aEndItr(aDetectiveObjList.end());
+    while( (aItr != aEndItr) && (aItr->aPosition == rMyCell.aCellAddress) )
     {
         rMyCell.aDetectiveObjVec.push_back( *aItr );
         aItr = aDetectiveObjList.erase( aItr );
@@ -584,7 +586,7 @@

 sal_Bool ScMyDetectiveOpContainer::GetFirstAddress( table::CellAddress& rCellAddress )
 {
-    sal_Int32 nTable = rCellAddress.Sheet;
+    sal_Int32 nTable(rCellAddress.Sheet);
     if( !aDetectiveOpList.empty() )
     {
         rCellAddress = aDetectiveOpList.begin()->aPosition;
@@ -596,8 +598,9 @@
 void ScMyDetectiveOpContainer::SetCellData( ScMyCell& rMyCell )
 {
     rMyCell.aDetectiveOpVec.clear();
-    ScMyDetectiveOpList::iterator aItr = aDetectiveOpList.begin();
-    while( (aItr != aDetectiveOpList.end()) && (aItr->aPosition == rMyCell.aCellAddress) )
+    ScMyDetectiveOpList::iterator aItr(aDetectiveOpList.begin());
+    ScMyDetectiveOpList::iterator aEndItr(aDetectiveOpList.end());
+    while( (aItr != aEndItr) && (aItr->aPosition == rMyCell.aCellAddress) )
     {
         rMyCell.aDetectiveOpVec.push_back( *aItr );
         aItr = aDetectiveOpList.erase( aItr );
@@ -630,7 +633,8 @@
     bKnowWhetherIsEditCell( sal_False ),
     bHasStringValue( sal_False ),
     bHasDoubleValue( sal_False ),
-    bHasXText( sal_False )
+    bHasXText( sal_False ),
+    nValidationIndex(-1)
 {
 }

@@ -730,11 +734,11 @@
     aCell.bHasAnnotation = sal_False;
     if (!aAnnotations.empty())
     {
-        ScMyExportAnnotationList::iterator aItr = aAnnotations.begin();
+        ScMyExportAnnotationList::iterator aItr(aAnnotations.begin());
         if ((aCell.aCellAddress.Column == aItr->aCellAddress.Column) &&
             (aCell.aCellAddress.Row == aItr->aCellAddress.Row))
         {
-            aCell.xAnnotation = aItr->xAnnotation;
+            aCell.xAnnotation.set(aItr->xAnnotation);
             uno::Reference<text::XSimpleText> xSimpleText(aCell.xAnnotation, uno::UNO_QUERY);
             if (aCell.xAnnotation.is() && xSimpleText.is())
             {
@@ -746,7 +750,7 @@
         }
     }
     if (xCellRange.is())
-        aCell.xCell = xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row);
+        aCell.xCell.set(xCellRange->getCellByPosition(aCell.aCellAddress.Column, aCell.aCellAddress.Row));
 }

 void ScMyNotEmptyCellsIterator::SetCurrentTable(const SCTAB nTable,
@@ -763,23 +767,22 @@
             delete pCellItr;
         pCellItr = new ScHorizontalCellIterator(rExport.GetDocument(), nCurrentTable, 0, 0,
             static_cast<SCCOL>(rExport.GetSharedData()->GetLastColumn(nCurrentTable)), static_cast<SCROW>(rExport.GetSharedData()->GetLastRow(nCurrentTable)));
-        xTable = rxTable;
-        xCellRange = uno::Reference<table::XCellRange>(xTable, uno::UNO_QUERY);
-        uno::Reference<sheet::XCellRangesQuery> xCellRangesQuery (xTable, uno::UNO_QUERY);
+        xTable.set(rxTable);
+        xCellRange.set(xTable, uno::UNO_QUERY);
         uno::Reference<sheet::XSheetAnnotationsSupplier> xSheetAnnotationsSupplier (xTable, uno::UNO_QUERY);
         if (xSheetAnnotationsSupplier.is())
         {
             uno::Reference<container::XEnumerationAccess> xAnnotationAccess ( xSheetAnnotationsSupplier->getAnnotations(), uno::UNO_QUERY);
             if (xAnnotationAccess.is())
             {
-                uno::Reference<container::XEnumeration> xAnnotations = xAnnotationAccess->createEnumeration();
+                uno::Reference<container::XEnumeration> xAnnotations(xAnnotationAccess->createEnumeration());
                 if (xAnnotations.is())
                 {
                     while (xAnnotations->hasMoreElements())
                     {
-                        uno::Any aAny = xAnnotations->nextElement();
                         ScMyExportAnnotation aAnnotation;
-                        if (aAny >>= aAnnotation.xAnnotation)
+                        aAnnotation.xAnnotation.set(xAnnotations->nextElement(), uno::UNO_QUERY);
+                        if (aAnnotation.xAnnotation.is())
                         {
                             aAnnotation.aCellAddress = aAnnotation.xAnnotation->getPosition();
                             aAnnotations.push_back(aAnnotation);
@@ -813,7 +816,7 @@
     if( pDetectiveOp )
         pDetectiveOp->UpdateAddress( aAddress );

-    sal_Bool bFoundCell = (aAddress.Column <= MAXCOL) && (aAddress.Row <= MAXROW);
+    sal_Bool bFoundCell((aAddress.Column <= MAXCOL) && (aAddress.Row <= MAXROW));
     if( bFoundCell )
     {
         SetCellData( aCell, aAddress );


git_rm

--- Game/test_log.cpp
+++ Game/test_log.cpp
@@ -1,14 +0,0 @@
-	#include <stdio.h>
-    #include "log.h"
-
-    int main(void)
-    {
-		Logger::GetLogger()->log_open("mycat");
-		int i = 10;
-		float j = 23.45;
-		Logger::GetLogger()->Info("info,%d,%f", i,j);
-		Logger::GetLogger()->Error("error");
-		Logger::GetLogger()->Warning("warn");
-		Logger::GetLogger()->log_close();
-        return 0;
-    }


Coverity fix.

Coverity fix.

--- STEER/AliTrackResidualsFast.cxx
+++ STEER/AliTrackResidualsFast.cxx
@@ -234,7 +234,8 @@

   Int_t fixedparamat[6]={0,0,0,0,0,0};
   const Int_t unfixedparam=GetNFreeParam();
-  Int_t position[6],last=0;//position is of size 6 but only unfiexedparam indeces will be used
+  Int_t position[6]={0,0,0,0,0,0};
+  Int_t last=0;//position is of size 6 but only unfiexedparam indeces will be used

   if(fBFixed[0]==kTRUE){
     fixedparamat[0]=1;


Remove code and includes that we no longer use.

--- DictationBridgeJFWHelper.cpp
+++ DictationBridgeJFWHelper.cpp
@@ -1,16 +1,10 @@
 #define UNICODE
 #include <windows.h>
 #include <ole2.h>
-#include <oaidl.h>
-#include <objbase.h>
 #include <AtlBase.h>
-#include <AtlConv.h>
 #include <algorithm>
-#include <iostream>
 #include <sstream>
 #include <string>
-#include <vector>
-#include <stdlib.h>
 #include "FSAPI.h"
 #include "dictationbridge-core/master/master.h"
 #include "combool.h"
@@ -25,22 +19,6 @@
 exit(1);\
 }\
 } while(0)
-
-std::string wideToString(wchar_t const * text, unsigned int length) {
-	auto tmp = new char[length*2+1];
-	auto resultingLen = WideCharToMultiByte(CP_UTF8, NULL, text,
-		length, tmp, length*2,
-		NULL, NULL);
-	tmp[resultingLen] = '\0';
-	std::string ret(tmp);
-	delete[] tmp;
-	return ret;
-}
-
-std::string BSTRToString(BSTR text) {
-	unsigned int len = SysStringLen(text);
-	return wideToString(text, len);
-}

 CComPtr<IJawsApi> pJfw =nullptr;


Member intialization order fixed and function comments removed from cpp file.

--- SurgSim/Graphics/OsgBoxRepresentation.cpp
+++ SurgSim/Graphics/OsgBoxRepresentation.cpp
@@ -27,8 +27,8 @@

 OsgBoxRepresentation::OsgBoxRepresentation(const std::string& name) : Representation(name), BoxRepresentation(name),
 	OsgRepresentation(name, new osg::Switch()),
-	m_sharedUnitBox(getSharedUnitBox()),
-	m_scale(1.0, 1.0, 1.0)
+	m_scale(1.0, 1.0, 1.0),
+	m_sharedUnitBox(getSharedUnitBox())
 {
 	m_switch = static_cast<osg::Switch*>(getOsgNode().get());
 	m_switch->setName(name + " Switch");
@@ -53,52 +53,36 @@
 	return m_switch->getChildValue(m_transform);
 }

-/// Sets the size along X-axis of the box
-/// \param sizeX Size along X-axis of the box
 void OsgBoxRepresentation::setSizeX(double sizeX)
 {
 	m_scale.x() = sizeX;
 	m_transform->setScale(m_scale);
 }
-/// Returns the size along X-axis of the box
-/// \return Size along X-axis of the box
 double OsgBoxRepresentation::getSizeX() const
 {
 	return m_scale.x();
 }

-/// Sets the size along Y-axis of the box
-/// \param sizeY Size along Y-axis of the box
 void OsgBoxRepresentation::setSizeY(double sizeY)
 {
 	m_scale.y() = sizeY;
 	m_transform->setScale(m_scale);
 }
-/// Returns the size along Y-axis of the box
-/// \return Size along Y-axis of the box
 double OsgBoxRepresentation::getSizeY() const
 {
 	return m_scale.y();
 }

-/// Sets the size along Z-axis of the box
-/// \param sizeZ Size along Z-axis of the box
 void OsgBoxRepresentation::setSizeZ(double sizeZ)
 {
 	m_scale.z() = sizeZ;
 	m_transform->setScale(m_scale);
 }
-/// Returns the size along Z-axis of the box
-/// \return Size along Z-axis of the box
 double OsgBoxRepresentation::getSizeZ() const
 {
 	return m_scale.z();
 }

-/// Sets the size of the box
-/// \param sizeX Size along X-axis of the box
-/// \param sizeY Size along Y-axis of the box
-/// \param sizeZ Size along Z-axis of the box
 void OsgBoxRepresentation::setSize(double sizeX, double sizeY, double sizeZ)
 {
 	m_scale.x() = sizeX;
@@ -106,10 +90,6 @@
 	m_scale.z() = sizeZ;
 	m_transform->setScale(m_scale);
 }
-/// Gets the size of the box
-/// \param sizeX Reference to store the size along X-axis of the box
-/// \param sizeY Reference to store the size along Y-axis of the box
-/// \param sizeZ Reference to store the size along Z-axis of the box
 void OsgBoxRepresentation::getSize(double& sizeX, double& sizeY, double& sizeZ)
 {
 	sizeX =	m_scale.x();
@@ -117,15 +97,11 @@
 	sizeZ = m_scale.z();
 }

-/// Sets the size of the box
-/// \param size Size of the box
 void OsgBoxRepresentation::setSize(SurgSim::Math::Vector3d size)
 {
 	m_scale.set(size.x(), size.y(), size.z());
 	m_transform->setScale(m_scale);
 }
-/// Returns the radius of the sphere
-/// \return Size of the box
 SurgSim::Math::Vector3d OsgBoxRepresentation::getSize() const
 {
 	return SurgSim::Math::Vector3d(m_scale._v);


lxqt-config-monitor: fix for reverting to previous configuration

--- lxqt-config-monitor/monitorsettingsdialog.cpp
+++ lxqt-config-monitor/monitorsettingsdialog.cpp
@@ -30,12 +30,13 @@
     ui.setupUi(this);

     KScreen::GetConfigOperation *operation = new KScreen::GetConfigOperation();
-    connect(operation, &KScreen::GetConfigOperation::finished, [&] (KScreen::ConfigOperation *op) {
+    connect(operation, &KScreen::GetConfigOperation::finished, [this, operation] (KScreen::ConfigOperation *op) {
         KScreen::GetConfigOperation *configOp = qobject_cast<KScreen::GetConfigOperation *>(op);
         if (configOp)
         {
-            mOldConfig = configOp->config();
+            mOldConfig = configOp->config()->clone();
             loadConfiguration(configOp->config());
+            operation->deleteLater();
         }
     });

@@ -82,12 +83,9 @@

         TimeoutDialog mTimeoutDialog;
         if (mTimeoutDialog.exec() == QDialog::Rejected)
-            // TODO: why isn't this working? why??
-            QTimer::singleShot(5000, [&] {
-                KScreen::SetConfigOperation(mOldConfig).exec();
-            });
+            KScreen::SetConfigOperation(mOldConfig).exec();
         else
-            mOldConfig = mConfig;
+            mOldConfig = mConfig->clone();
     }
 }


Add equality operator for Maliit::PreeditTextFormat.

RevBy: Michael Hasselmann

It is needed by QCOMPARE. I didn't add it to namespace.h in Maliit
framework as this operator is not used anywhere else.

This work was done by Openismus GmbH for Canonical Ltd

--- maliit-keyboard/tests/preedit-string/main.cpp
+++ maliit-keyboard/tests/preedit-string/main.cpp
@@ -131,7 +131,12 @@

     return result;
 }
-}
+
+bool operator==(const Maliit::PreeditTextFormat &a, const Maliit::PreeditTextFormat &b) {
+    return ((a.start == b.start) and (a.length == b.length) and (a.preeditFace == b.preeditFace));
+}
+
+} // unnamed namespace

 class TestPreeditString


Enable pipeline statistics feature (validation)

--- terraintessellation/terraintessellation.cpp
+++ terraintessellation/terraintessellation.cpp
@@ -127,6 +127,8 @@
 		enabledFeatures.tessellationShader = VK_TRUE;
 		// Example also uses a wireframe pipeline, enable non-solid fill modes
 		enabledFeatures.fillModeNonSolid = VK_TRUE;
+		// Pipeline statistics
+		enabledFeatures.pipelineStatisticsQuery = VK_TRUE;
 	}

 	~VulkanExample()


Fix license statement on Fresnel demo code - all samples are supposed to be public domain / free use.

--- Samples/Fresnel/src/Fresnel.cpp
+++ Samples/Fresnel/src/Fresnel.cpp
@@ -1,29 +1,14 @@
 /*
 -----------------------------------------------------------------------------
 This source file is part of OGRE
-    (Object-oriented Graphics Rendering Engine)
+(Object-oriented Graphics Rendering Engine)
 For the latest info, see http://www.ogre3d.org/

 Copyright (c) 2000-2006 Torus Knot Software Ltd
 Also see acknowledgements in Readme.html

-This program is free software; you can redistribute it and/or modify it under
-the terms of the GNU Lesser General Public License as published by the Free Software
-Foundation; either version 2 of the License, or (at your option) any later
-version.
-
-This program 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 program; if not, write to the Free Software Foundation, Inc., 59 Temple
-Place - Suite 330, Boston, MA 02111-1307, USA, or go to
-http://www.gnu.org/copyleft/lesser.txt.
-
-You may alternatively use this source under the terms of a specific version of
-the OGRE Unrestricted License provided you have obtained such a license from
-Torus Knot Software Ltd.
+You may use this sample code for anything you like, it is not covered by the
+LGPL like the rest of the engine.
 -----------------------------------------------------------------------------
 */
 /*


--- elab_net.cc
+++ elab_net.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_net.cc,v 1.129 2004/06/16 23:32:58 steve Exp $"
+#ident "$Id: elab_net.cc,v 1.130 2004/06/18 16:38:22 steve Exp $"
 #endif

 # include "config.h"
@@ -423,10 +423,32 @@
       if (val.len() < lsig->pin_count())
 	    val = verinum(val, lsig->pin_count());

+	/* Look for the very special case that we know the compare
+	   results a priori due to different high bits, that are
+	   constant pad in the signal. */
+      if (val.len() > lsig->pin_count()) {
+	    unsigned idx = lsig->pin_count();
+	    verinum::V lpad = verinum::V0;
+
+	    while (idx < val.len()) {
+		  if (val.get(idx) != lpad) {
+			verinum oval (op_code == 'e'
+				      ? verinum::V0
+				      : verinum::V1,
+				      1);
+			NetEConst*ogate = new NetEConst(oval);
+			NetNet*osig = ogate->synthesize(des);
+			delete ogate;
+			return osig;
+		  }
+
+		  idx +=1;
+	    }
+      }

       unsigned zeros = 0;
       unsigned ones = 0;
-      for (unsigned idx = 0 ;  idx < val.len() ;  idx += 1) {
+      for (unsigned idx = 0 ;  idx < lsig->pin_count() ;  idx += 1) {
 	    if (val.get(idx) == verinum::V0)
 		  zeros += 1;
 	    if (val.get(idx) == verinum::V1)
@@ -450,7 +472,7 @@

       unsigned zidx = 0;
       unsigned oidx = 0;
-      for (unsigned idx = 0 ;  idx < val.len() ;  idx += 1) {
+      for (unsigned idx = 0 ;  idx < lsig->pin_count() ;  idx += 1) {
 	    if (val.get(idx) == verinum::V0) {
 		  zidx += 1;
 		  connect(zero_gate->pin(zidx), lsig->pin(idx));
@@ -2573,6 +2595,9 @@

 /*
  * $Log: elab_net.cc,v $
+ * Revision 1.130  2004/06/18 16:38:22  steve
+ *  compare-to-constant uses sig len, not val len.
+ *
  * Revision 1.129  2004/06/16 23:32:58  steve
  *  Handle equality compare to constants specially.
  *


Fix gcc build (copy & paste error) Fix warning

--- Samples/Terrain/src/Terrain.cpp
+++ Samples/Terrain/src/Terrain.cpp
@@ -91,7 +91,7 @@
 		return true;
 	}

-	bool OIS::KeyListener::keyReleased(const OIS::KeyEvent &)
+	bool keyReleased(const OIS::KeyEvent &)
 	{
 		return true;
 	}
@@ -479,7 +479,7 @@
 			mTerrain = OGRE_NEW Terrain(mSceneMgr);
 			mTerrain->load(TERRAIN_FILE);
 		}
-		catch (Exception& e)
+		catch (Exception&)
 		{
 			OGRE_DELETE mTerrain;
 			mTerrain = 0;


Fix pointer offset bug in draw_vline.

Fix pointer offset bug in draw_vline.

--- src/du-ino_ssd1306.cpp
+++ src/du-ino_ssd1306.cpp
@@ -262,11 +262,12 @@
   // solid bytes
   if(rh >= 8)
   {
-    if (color == Inverse)
+    if(color == Inverse)
     {
       do
       {
-        *bp = ~(*bp) + SSD1306_LCDWIDTH;
+        *bp = ~(*bp);
+        bp += SSD1306_LCDWIDTH;
         rh -= 8;
       }
       while(rh >= 8);


Changes

Changes

--- ServPrj/ServerPrj.cc
+++ ServPrj/ServerPrj.cc
@@ -128,7 +128,7 @@

 	ham_action_t *testAction;
 	char actionName[]="RESTART_SERVER";
-	if((testAction=ham_action_restart( testCondition,	actionName, "/tmp/test.sh 1>1.txt 2>2.txt" /*"/tmp/ServPrj_g 1>1.txt 2>2.txt"*/, /*NULL*/HREARMAFTERRESTART))==NULL){
+	if((testAction=ham_action_restart( testCondition,	actionName, "/tmp/ServPrj_g 1>1.txt 2>2.txt" /*"/tmp/ServPrj_g 1>1.txt 2>2.txt"*/, /*NULL*/HREARMAFTERRESTART))==NULL){
 		perror("[ERROR]: Ham condition");
 	};

@@ -506,7 +506,6 @@
 				break;
 			};
 			//Receiving
-			//TaskResultCommonStruct taskResultCommonStruct;
 			recieveID=MsgReceive(serverInternalStaticData->chidSlaveTask, &pulseBuff, sizeof(_pulse), &msgInfo);
 			//Timeout - no free Slaves - this is bad news....
 			if (recieveID<0 &&  errno== ETIMEDOUT) {
@@ -795,6 +794,8 @@
 	ServerInternalDynamicData serverInternalDynamicData;
 	ServerInternalStaticData serverInternalStaticData;
 	ServerConfigs serverConfigs;
+
+
 	std::string pathToConfigFile=std::string(argv[0]);
     pathToConfigFile=pathToConfigFile.substr(0, pathToConfigFile.find_last_of('/')+1)+std::string(CONFIG_FILE_PATH);


stop overwriting arguem,nts

stop overwriting arguem,nts

--- Opcodes/doppler.cpp
+++ Opcodes/doppler.cpp
@@ -127,15 +127,15 @@
     blockRate = sampleRate / blockSize;
     // Take care of default values.
     if (*jSpeedOfSound == MYFLT(-1.0)) {
-      *jSpeedOfSound = MYFLT(340.29);
-    }
-    speedOfSound = *jSpeedOfSound;
+      speedOfSound = MYFLT(340.29);
+    }
+    else speedOfSound = *jSpeedOfSound;
     if (*jUpdateFilterCutoff == MYFLT(-1.0)) {
 //    MYFLT blockRateNyquist = blockRate / MYFLT(2.0);
 //    *jUpdateFilterCutoff = blockRateNyquist / MYFLT(2.0);
-      *jUpdateFilterCutoff = MYFLT(6.0); // very conservative
-    }
-    smoothingFilterCutoff = *jUpdateFilterCutoff;
+      smoothingFilterCutoff = MYFLT(6.0); // very conservative
+    }
+    else smoothingFilterCutoff = *jUpdateFilterCutoff;
     samplesPerDistance = sampleRate / speedOfSound;
     audioInterpolator = new LinearInterpolator;
     smoothingFilter = NULL;
@@ -234,14 +234,14 @@
     blockRate = sampleRate / blockSize;
     // Take care of default values.
     if (*jSpeedOfSound == MYFLT(-1.0)) {
-      *jSpeedOfSound = MYFLT(340.29);
-    }
-    speedOfSound = *jSpeedOfSound;
+      SpeedOfSound = MYFLT(340.29);
+    }
+    else speedOfSound = *jSpeedOfSound;
     if (*jUpdateFilterCutoff == MYFLT(-1.0)) {
       MYFLT blockRateNyquist = blockRate / MYFLT(2.0);
-      *jUpdateFilterCutoff = blockRateNyquist / MYFLT(2.0);
-    }
-    smoothingFilterCutoff = *jUpdateFilterCutoff;
+      smoothingFilterCutoff = blockRateNyquist / MYFLT(2.0);
+    }
+    else smoothingFilterCutoff = *jUpdateFilterCutoff;
     samplesPerDistance = sampleRate / speedOfSound;
     audioInterpolator = new LinearInterpolator;
     // The smoothing filter cannot be initialized at i-time,


remove uncessary setIcons call

remove uncessary setIcons call

svn path=/trunk/KDE/kdelibs/kate/; revision=471698

--- part/part/kateglobal.cpp
+++ part/part/kateglobal.cpp
@@ -253,10 +253,6 @@
                                       KDialogBase::Ok,
                                       parent );

-#ifndef Q_WS_WIN //TODO: reenable
-  KWin::setIcons( kd->winId(), kapp->icon(), kapp->miniIcon() );
-#endif
-
   QList<KTextEditor::ConfigPage*> editorPages;

   for (int i = 0; i < configPages (); ++i)


Populate the language box

Populate the language box

--- Settings/General.cpp
+++ Settings/General.cpp
@@ -53,15 +53,14 @@
     }
     LoadSkinInfo(current);

-//    /* Populate the language box */
-//    std::list<CString> languages = FindLanguages(
-//        settings->LanguagesDir().c_str());
-
-//    for (CString language : languages) {
-//        _lang.AddString(language);
-//    }
-//    std::wstring currentLang = settings->LanguageName();
-//    _lang.SelectString(0, currentLang.c_str());
+    /* Populate the language box */
+    std::list<std::wstring> languages = FindLanguages(
+        settings->LanguagesDir().c_str());
+    for (std::wstring language : languages) {
+        _ctxt->AddComboItem(CMB_LANG, language);
+    }
+    std::wstring currentLang = settings->LanguageName();
+    _ctxt->SelectComboItem(CMB_LANG, currentLang);
 }

 void General::SaveSettings() {


Fix a minor bug in 3dxml header date writing.

--- io/glc_worldto3dxml.cpp
+++ io/glc_worldto3dxml.cpp
@@ -149,7 +149,7 @@
 		m_pOutStream->writeTextElement("SchemaVersion", "4.0");
 		m_pOutStream->writeTextElement("Title", title);
 		m_pOutStream->writeTextElement("Generator", m_Generator);
-		m_pOutStream->writeTextElement("Created", QDate::currentDate().toString("YYYY-MM-DD"));
+		m_pOutStream->writeTextElement("Created", QDate::currentDate().toString(Qt::ISODate));
 	m_pOutStream->writeEndElement();
 }


Shader defines are no longer sorted before being used

- The hash combiner was already order independent

--- Engine/Jewel3D/Resource/Shader.cpp
+++ Engine/Jewel3D/Resource/Shader.cpp
@@ -8,7 +8,6 @@
 #include "Jewel3D/Utilities/String.h"

 #include <GLEW/GL/glew.h>
-#include <algorithm>
 #include <cctype>
 #include <functional>
 #include <iostream>
@@ -381,18 +380,12 @@

 	void ShaderVariantControl::UpdateHash()
 	{
-		// Sort alphabetically to eliminate order of defines creating different hashes.
-		std::sort(defines.begin(), defines.end(), [](const auto& lhs, const auto& rhs)
-		{
-			return lhs.name < rhs.name;
-		});
-
 		std::hash<std::string> str_hash;
-		hash = 0;
+		hash = 0x0;

 		for (auto& define : defines)
 		{
-			hash = hash ^ str_hash(define.name) ^ str_hash(define.value);
+			hash += str_hash(define.name) + str_hash(define.value);
 		}
 	}


git-svn-id: https://subversion.assembla.com/svn/alienswarmdirectormod@51 2c9b7856-6c2d-475a-89f6-b655c9bcaa01

--- trunk/src/game/server/mod_objective_escape.cpp
+++ trunk/src/game/server/mod_objective_escape.cpp
@@ -117,7 +117,7 @@
 	return true;
 }

-void MOD_Level_Builder::BuildMapForNextMission()
+void CMOD_Objective_Escape::BuildMapForNextMission()
 {
 	CASW_Campaign_Info *pCampaign = CAlienSwarm::GetCampaignInfo();
 	if (!pCampaign)


wrd: test: add TC for defAssignExpr

wrd: test: add TC for defAssignExpr

--- mod/test/case/wrd/syntax/defAssignExprTest.cc
+++ mod/test/case/wrd/syntax/defAssignExprTest.cc
@@ -86,3 +86,33 @@
     )SRC").shouldVerified(true);
     run();
 }
+
+TEST_F(defAssignExprTest, defAssignInObjectRefersInvalidFuncNegative) {
+    make().parse(R"SRC(
+        aka sys.con c
+        nickname := foo()
+
+        foo() str
+            c.print("I'm foo!\n")
+            return 1 // this is invalid function.
+
+        main() void
+            c.print("your nickname is " + nickname)
+    )SRC").shouldParsed(true);
+    shouldVerified(false);
+}
+
+TEST_F(defAssignExprTest, defAssignInObjectRefersInvalidFuncNegative2) {
+    make().parse(R"SRC(
+        aka sys.con c
+        nickname := boo() // refers the func that doesn't exist.
+
+        foo() str
+            c.print("I'm foo!\n")
+            return 1 // this is invalid function.
+
+        main() void
+            c.print("your nickname is " + nickname)
+    )SRC").shouldParsed(true);
+    shouldVerified(false);
+}


PERF: vtkDataSetAttributes::CopyData was getting 2 arrays as vtkDataArray's and calling a method that took as input 2 vtkAbstractArray's. This was resulting in 2 extraneous calls to vtkObject::SafeDownCast per call to CopyData. vtkAppendFilter calls vtkDataSetAttributes once per point and cell in the input dataset resulting in potentially millions of unnecessary calls to SafeDownCast

--- Filtering/vtkDataSetAttributes.cxx
+++ Filtering/vtkDataSetAttributes.cxx
@@ -30,7 +30,7 @@
 #include "vtkIdTypeArray.h"
 #include "vtkObjectFactory.h"

-vtkCxxRevisionMacro(vtkDataSetAttributes, "1.18");
+vtkCxxRevisionMacro(vtkDataSetAttributes, "1.19");
 vtkStandardNewMacro(vtkDataSetAttributes);

 //--------------------------------------------------------------------------
@@ -1470,16 +1470,16 @@
                                     vtkDataSetAttributes* fromDSA,
                                     int idx, vtkIdType fromId, vtkIdType toId)
 {
-  vtkDataArray *fromDA;
-  vtkDataArray *toDA;
+  vtkAbstractArray *fromDA;
+  vtkAbstractArray *toDA;

   int i;
   for (i=0; i < list.NumberOfFields; i++)
     {
     if ( list.FieldIndices[i] >= 0 )
       {
-      toDA = this->GetArray(list.FieldIndices[i]);
-      fromDA = fromDSA->GetArray(list.DSAIndices[idx][i]);
+      toDA = this->GetAbstractArray(list.FieldIndices[i]);
+      fromDA = fromDSA->GetAbstractArray(list.DSAIndices[idx][i]);
       this->CopyTuple(fromDA, toDA, fromId, toId);
       }
     }


BUG: Fix Bug #1168. vtkDataSetAttributes was doing unsafe type operation. When dataset was unsigned int, the intermediate could not be negative at any time.

--- Filtering/vtkDataSetAttributes.cxx
+++ Filtering/vtkDataSetAttributes.cxx
@@ -29,7 +29,7 @@
 #include "vtkIdTypeArray.h"
 #include "vtkObjectFactory.h"

-vtkCxxRevisionMacro(vtkDataSetAttributes, "1.1");
+vtkCxxRevisionMacro(vtkDataSetAttributes, "1.2");
 vtkStandardNewMacro(vtkDataSetAttributes);

 //--------------------------------------------------------------------------
@@ -979,7 +979,7 @@
       char *from=((vtkCharArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (char) c;
         }
       }
@@ -991,7 +991,7 @@
       unsigned char *from=((vtkUnsignedCharArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (unsigned char) c;
         }
       }
@@ -1003,7 +1003,7 @@
       short *from=((vtkShortArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (short) c;
         }
       }
@@ -1015,7 +1015,7 @@
       unsigned short *from=((vtkUnsignedShortArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (unsigned short) c;
         }
       }
@@ -1027,7 +1027,7 @@
       int *from=((vtkIntArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (int) c;
         }
       }
@@ -1039,7 +1039,7 @@
       unsigned int *from=((vtkUnsignedIntArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = from[idx1+i] + t * (from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (unsigned int) c;
         }
       }
@@ -1051,7 +1051,7 @@
       long *from=((vtkLongArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = (double)from[idx1+i] + t * (double)(from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (long) c;
         }
       }
@@ -1063,7 +1063,7 @@
       unsigned long *from=((vtkUnsignedLongArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = (double)from[idx1+i] + t * (double)(from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (unsigned long) c;
         }
       }
@@ -1099,7 +1099,7 @@
       vtkIdType *from=((vtkIdTypeArray *)fromData)->GetPointer(0);
       for (i=0; i<numComp; i++)
         {
-        c = (double)from[idx1+i] + t * (double)(from[idx2+i] - from[idx1+i]);
+        c = (1.0 - t) * from[idx1+i] + t * from[idx2+i];
         *to++ = (vtkIdType) c;
         }
       }
@@ -1129,7 +1129,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1->GetValue(ii)+ t * (from2->GetValue(ii) - from1->GetValue(ii));
+        c = from1->GetValue(ii) + t * (from2->GetValue(ii) - from1->GetValue(ii));
         to->InsertValue(ii, (int)c);
         }
       }
@@ -1143,7 +1143,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (char) c;
         }
       }
@@ -1157,7 +1157,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (unsigned char) c;
         }
       }
@@ -1171,7 +1171,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (short) c;
         }
       }
@@ -1185,7 +1185,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (unsigned short) c;
         }
       }
@@ -1199,7 +1199,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (int) c;
         }
       }
@@ -1213,7 +1213,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = from1[ii] + t * (from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (unsigned int) c;
         }
       }
@@ -1227,7 +1227,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = (double)from1[ii] + t * (double)(from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (long) c;
         }
       }
@@ -1241,7 +1241,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = (double)from1[ii] + t * (double)(from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (unsigned long) c;
         }
       }
@@ -1283,7 +1283,7 @@
       for (i=0; i<numComp; i++)
         {
         ii = idx + i;
-        c = (double)from1[ii] + t * (double)(from2[ii] - from1[ii]);
+        c = (1.0 - t) * from1[ii] + t * from2[ii];
         *to++ = (vtkIdType) c;
         }
       }


#96435# pointer access corrected

#96435# pointer access corrected

--- dbaccess/source/core/api/FilteredContainer.cxx
+++ dbaccess/source/core/api/FilteredContainer.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FilteredContainer.cxx,v $
  *
- *  $Revision: 1.1 $
- *
- *  last change: $Author: oj $ $Date: 2002-08-23 05:55:09 $
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: oj $ $Date: 2002-08-26 07:59:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,12 +118,14 @@
         {
             if (pTableFilters->indexOf('%') != -1)
             {
-                _rOut.push_back(WildCard(pTableFilters[i].replace('%', '*')));
+                _rOut.push_back(WildCard(pTableFilters->replace('%', '*')));
             }
             else
             {
                 if (nShiftPos != i)
-                    pTableFilters[nShiftPos] = pTableFilters[i];
+                {
+                    _rTableFilter.getArray()[nShiftPos] = _rTableFilter.getArray()[i];
+                }
                 ++nShiftPos;
             }
         }


BUG #15662: vtkAppendPolyData does not remove UPDATE_EXTENT

For a pipeline as the following:

  // image0 image1 image2
  // dmcubes0 dmcubes1 dmcubes2
  // \          |       /
  // vtkAppendPolyData
  // mapper/actor
  // renderer

dmcubes is a discrete marching cubes alg.
The pipeline forwards UPDATE_EXTENT for all its inputs.
This results in the UPDATE_EXTENT from the first image being compared with the WHOLE_EXTENT of the
second image which results in a mismatch.

We fix this by letting downstream request a subset of connection 0, for connections >= 1
we send their WHOLE_EXTENT as UPDATE_EXTENT.

--- Filters/Core/vtkAppendPolyData.cxx
+++ Filters/Core/vtkAppendPolyData.cxx
@@ -676,6 +676,18 @@
         }
       }
     }
+  // Let downstream request a subset of connection 0, for connections >= 1
+  // send their WHOLE_EXTENT as UPDATE_EXTENT.
+  for (idx = 1; idx < numInputs; ++idx)
+    {
+    vtkInformation * inputInfo = inputVector[0]->GetInformationObject(idx);
+    if (inputInfo->Has(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT()))
+      {
+      int ext[6];
+      inputInfo->Get(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(), ext);
+      inputInfo->Set(vtkStreamingDemandDrivenPipeline::UPDATE_EXTENT(), ext, 6);
+      }
+    }

   return 1;
 }


INTEGRATION: CWS dba25 (1.20.102); FILE MERGED 2005/03/04 07:25:33 oj 1.20.102.1: #i43912# connection now supports also XGroupsSupplier and XUsersSupplier if the master tables supports it

--- dbaccess/source/core/dataaccess/connection.hxx
+++ dbaccess/source/core/dataaccess/connection.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: connection.hxx,v $
  *
- *  $Revision: 1.20 $
- *
- *  last change: $Author: hr $ $Date: 2004-08-02 15:08:25 $
+ *  $Revision: 1.21 $
+ *
+ *  last change: $Author: obo $ $Date: 2005-03-18 10:05:45 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,11 +79,17 @@
 #ifndef _COM_SUN_STAR_SDBCX_XVIEWSSUPPLIER_HPP_
 #include <com/sun/star/sdbcx/XViewsSupplier.hpp>
 #endif
+#ifndef _COM_SUN_STAR_SDBCX_XUSERSSUPPLIER_HPP_
+#include <com/sun/star/sdbcx/XUsersSupplier.hpp>
+#endif
+#ifndef _COM_SUN_STAR_SDBCX_XGROUPSSUPPLIER_HPP_
+#include <com/sun/star/sdbcx/XGroupsSupplier.hpp>
+#endif
 #ifndef _COM_SUN_STAR_SDB_XQUERIESSUPPLIER_HPP_
 #include <com/sun/star/sdb/XQueriesSupplier.hpp>
 #endif
-#ifndef _CPPUHELPER_IMPLBASE9_HXX_
-#include <cppuhelper/implbase9.hxx>
+#ifndef _CPPUHELPER_IMPLBASE11_HXX_
+#include <cppuhelper/implbase11.hxx>
 #endif
 #ifndef _DBASHARED_APITOOLS_HXX_
 #include "apitools.hxx"
@@ -114,7 +120,7 @@

 //==========================================================================
 //==========================================================================
-typedef ::cppu::ImplHelper9 <   ::com::sun::star::container::XChild
+typedef ::cppu::ImplHelper11<   ::com::sun::star::container::XChild
                             ,   ::com::sun::star::sdbcx::XTablesSupplier
                             ,   ::com::sun::star::sdbcx::XViewsSupplier
                             ,   ::com::sun::star::sdbc::XConnection
@@ -123,6 +129,8 @@
                             ,   ::com::sun::star::sdb::XCommandPreparation
                             ,   ::com::sun::star::lang::XServiceInfo
                             ,   ::com::sun::star::lang::XMultiServiceFactory
+                            ,   ::com::sun::star::sdbcx::XUsersSupplier
+                            ,   ::com::sun::star::sdbcx::XGroupsSupplier
                             >   OConnection_Base;

 class ODatabaseSource;
@@ -154,6 +162,8 @@
     OViewContainer*             m_pViews;
     ::com::sun::star::uno::Any  m_aAdditionalWarnings;  // own warnings (appended to the ones got by the master connection)
     sal_Bool                    m_bSupportsViews;       // true when the getTableTypes return "VIEW" as type
+    sal_Bool                    m_bSupportsUsers;
+    sal_Bool                    m_bSupportsGroups;

 protected:
     virtual ~OConnection();
@@ -229,6 +239,11 @@
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createInstanceWithArguments( const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getAvailableServiceNames(  ) throw (::com::sun::star::uno::RuntimeException);

+    // XUsersSupplier
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers(  ) throw(::com::sun::star::uno::RuntimeException);
+    // XGroupsSupplier
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getGroups(  ) throw(::com::sun::star::uno::RuntimeException);
+
     // IRefreshListener
     virtual void refresh(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rToBeRefreshed);
 protected:
@@ -245,6 +260,8 @@
         if ( rBHelper.bDisposed || !m_xConnection.is() )
             throw ::com::sun::star::lang::DisposedException();
     }
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > getMasterTables();
 };

 //........................................................................


added test for golay_encode_portion(). Confirmed that it works correctly.

--- Firmware/radio/interleave_test.cpp
+++ Firmware/radio/interleave_test.cpp
@@ -213,6 +213,65 @@
   }
   printf("  -- test passed.\n");

+  // Try interleaving writing the data piece at a time using golay_encode_portion()
+  // and make sure it works the same as doing the whole lot.
+  printf("Testing golay_encode_portion()\n");
+  int split;
+  for(n=0;n<128;n+=3) {
+    for(split=n;split>=0;split-=3)
+      {
+	prefill(in);
+	interleave=0;
+	golay_encode(n,in,out);
+	int icount=countones(n*2,out);
+	interleave=1;
+	// Encode in two pieces, beginning with the last piece first
+	if (split<n) {
+	  offset_start=split;
+	  offset_end=n;
+	  golay_encode_portion(n*2,&in[offset_start],out);
+	}
+	if (split>0) {
+	  offset_start=0;
+	  offset_end=split-1;
+	  golay_encode_portion(n*2,&in[offset_start],out);
+	}
+	int ncount=countones(n*2,out);
+	if (icount!=ncount) {
+	  printf("Test failed: different number of set bits with/without"
+		 " interleaving: %d vs %d (n=%d, split=%d)\n",
+		 icount,ncount,n,split);
+	  show("output using golay_encode_portion()",n*2,out);
+	  golay_encode(n,in,out);
+	  show("output using golay_encode()",n*2,out);
+	  exit(-1);
+	}
+	bzero(verify,256);
+	int errcount=golay_decode(n*2,out,verify);
+	if (bcmp(in,verify,n)||errcount) {
+	  printf("Decode error for packet of %d bytes (errcount=%d)\n",n,errcount);
+	  show("input",n,in);
+	  show("verify error (should be 0x00 -- 0xnn)",n,verify);
+
+	  show("interleaved encoded version",n*2,out);
+	  unsigned char out2[512];
+	  interleave=0;
+	  golay_encode(n,in,out2);
+	  show("uninterleaved encoded version",n*2,out2);
+
+	  int k;
+	  interleave_data_size=n*2;
+	  for(k=0;k<n*2;k++)
+	    out2[k]=interleave_getbyte(out,k);
+	  show("de-interleaved version of interleaved encoded version",n*2,out2);
+
+	  exit(-1);
+	}
+      }
+  }
+  printf("  -- test passed.\n");
+
+
   // Try interleaving and golay protecting a block of data
   // But this time, introduce errors
   printf("Testing interleaving at golay_{en,de}code() level with burst errors.\n");


INTEGRATION: CWS dba24d (1.25.160); FILE MERGED 2007/12/04 09:24:09 oj 1.25.160.1: #i81644# add new common var to block elementInserted events

--- dbaccess/source/core/dataaccess/connection.hxx
+++ dbaccess/source/core/dataaccess/connection.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: connection.hxx,v $
  *
- *  $Revision: 1.25 $
- *
- *  last change: $Author: kz $ $Date: 2006-10-05 12:58:51 $
+ *  $Revision: 1.26 $
+ *
+ *  last change: $Author: rt $ $Date: 2008-01-30 08:32:45 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -160,6 +160,7 @@
     OTableContainer*            m_pTables;
     OViewContainer*             m_pViews;
     WarningsContainer           m_aWarnings;
+    oslInterlockedCount         m_nInAppend;
     sal_Bool                    m_bSupportsViews;       // true when the getTableTypes return "VIEW" as type
     sal_Bool                    m_bSupportsUsers;
     sal_Bool                    m_bSupportsGroups;


INTEGRATION: CWS changefileheader (1.15.82); FILE MERGED 2008/03/31 13:26:53 rt 1.15.82.1: #i87441# Change license header to LPGL v3.

--- dbaccess/source/filter/migration/cfgimport.cxx
+++ dbaccess/source/filter/migration/cfgimport.cxx
@@ -1,35 +1,30 @@
  /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: cfgimport.cxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.15 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: ihi $ $Date: 2007-11-21 15:42:20 $
+ * $RCSfile: cfgimport.cxx,v $
+ * $Revision: 1.16 $
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/


More pips added

More pips added

--- ecp5/gfx.cc
+++ ecp5/gfx.cc
@@ -404,6 +404,46 @@

 }

+void setSource(GraphicElement &el, int x, int y, WireId src, IdString src_type, GfxTileWireId src_id)
+{
+    if (src_type == id_WIRE_TYPE_H02) {
+        el.x1 = x + switchbox_x1 + 0.0017f*(16 + (src_id - TILE_WIRE_H02W0701)+ 20 *(src.location.x%3));
+        el.y1 = y + switchbox_y1;
+    }
+    if (src_type == id_WIRE_TYPE_H06) {
+        el.x1 = x + switchbox_x1 + 0.0017f*(96 + (src_id - TILE_WIRE_H06W0303)+ 20 *(x%3));
+        el.y1 = y + switchbox_y1;
+    }
+    if (src_type == id_WIRE_TYPE_V02) {
+        el.x1 = x + switchbox_x1;
+        el.y1 = y + switchbox_y1 + 0.0017f*(20 + (src_id - TILE_WIRE_V02N0701)+ 20 *(src.location.y%3));
+    }
+    if (src_type == id_WIRE_TYPE_V06) {
+        el.x1 = x + switchbox_x1;
+        el.y1 = y + switchbox_y1 + 0.0017f*(96 + (src_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
+    }
+}
+
+void setDestination(GraphicElement &el, int x, int y, WireId dst, IdString dst_type, GfxTileWireId dst_id)
+{
+    if (dst_type == id_WIRE_TYPE_H02) {
+        el.x2 = x + switchbox_x1 + 0.0017f*(16 + (dst_id - TILE_WIRE_H02W0701)+ 20 *(dst.location.x%3));
+        el.y2 = y + switchbox_y1;
+    }
+    if (dst_type == id_WIRE_TYPE_H06) {
+        el.x2 = x + switchbox_x1 + 0.0017f*(96 + (dst_id - TILE_WIRE_H06W0303)+ 20 *(x%3));
+        el.y2 = y + switchbox_y1;
+    }
+    if (dst_type == id_WIRE_TYPE_V02) {
+        el.x2 = x + switchbox_x1;
+        el.y2 = y + switchbox_y1 + 0.0017f*(20 + (dst_id - TILE_WIRE_V02N0701)+ 20 *(dst.location.y%3));
+    }
+    if (dst_type == id_WIRE_TYPE_V06) {
+        el.x2 = x + switchbox_x1;
+        el.y2 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
+    }
+}
+
 void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, WireId src, IdString src_type, GfxTileWireId src_id, WireId dst, IdString dst_type, GfxTileWireId dst_id, GraphicElement::style_t style)
 {
     GraphicElement el;
@@ -411,13 +451,10 @@
     el.style = style;

     if (src_type == id_WIRE_TYPE_H06 && dst_type == id_WIRE_TYPE_V06) {
-        el.x1 = x + switchbox_x1 + 0.0017f*(96 + (src_id - TILE_WIRE_H06W0303)+ 20 *(x%3));
-        el.y1 = y + switchbox_y1;
-
-        el.y2 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
-        el.x2 = x + switchbox_x1;
-        g.push_back(el);
-    }
+        setSource(el,x,y,src,src_type,src_id);
+        setDestination(el,x,y,dst,dst_type,dst_id);
+        g.push_back(el);
+    }
     if (src_type == id_WIRE_TYPE_H01 && dst_type == id_WIRE_TYPE_V06) {
         if (src_id <= TILE_WIRE_H01E0101) {

@@ -441,67 +478,189 @@
             el.x2 = x + switchbox_x1;
             g.push_back(el);
         }
-    }
+    }
     if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V06) {
-        el.x1 = x + switchbox_x1;
-        el.y1 = y + switchbox_y1 + 0.0017f*(20 + (src_id - TILE_WIRE_V02N0701)+ 20 *(src.location.y%3));
-
-        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2;
-        el.y2 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
-        g.push_back(el);
-
-        el.x1 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2;
-        el.y1 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
-        el.y2 = y + switchbox_y1 + 0.0017f*(96 + (dst_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
-        el.x2 = x + switchbox_x1;
-        g.push_back(el);
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2 + 0.0017f*(src_id - TILE_WIRE_V02N0701);
+        el.y2 = el.y1;
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el.x2;
+        el.y1 = el2.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
     }
+    if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_V02) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2 + 0.0017f*(src_id - TILE_WIRE_V06N0303);
+        el.y2 = el.y1;
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el.x2;
+        el.y1 = el2.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+    if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V02) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2 - 0.0017f*(src_id - TILE_WIRE_V02N0701);
+        el.y2 = el.y1;
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el.x2;
+        el.y1 = el2.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+    if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_V06) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2 + 0.0017f*(src_id - TILE_WIRE_V06N0303);
+        el.y2 = el.y1;
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el.x2;
+        el.y1 = el2.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
     if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V02) {
-        el.x1 = x + switchbox_x1 + 0.0017f*(16 + (src_id - TILE_WIRE_H02W0701)+ 20 *(src.location.x%3));
-        el.y1 = y + switchbox_y1;
-
-        el.x2 = x + switchbox_x1;
-        el.y2 = y + switchbox_y1 + 0.0017f*(20 + (dst_id - TILE_WIRE_V02N0701)+ 20 *(dst.location.y%3));
+        setSource(el,x,y,src,src_type,src_id);
+        setDestination(el,x,y,dst,dst_type,dst_id);

         g.push_back(el);
     }
     if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_H02) {
-        el.x1 = x + switchbox_x1 + 0.0017f*(16 + (dst_id - TILE_WIRE_H02W0701)+ 20 *(dst.location.x%3));
-        el.y1 = y + switchbox_y1;
-
-        el.x2 = x + switchbox_x1;
-        el.y2 = y + switchbox_y1 + 0.0017f*(20 + (src_id - TILE_WIRE_V02N0701)+ 20 *(src.location.y%3));
+        setSource(el,x,y,src,src_type,src_id);
+        setDestination(el,x,y,dst,dst_type,dst_id);

         g.push_back(el);
     }
-    if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V02) {
-
-        el.x1 = x + switchbox_x1;
-        el.y1 = y + switchbox_y1 + 0.0017f*(20 + (src_id - TILE_WIRE_V02N0701)+ 20 *(src.location.y%3));
-
-        el.x2 = x + switchbox_x1 + (switchbox_x2-switchbox_x1)/2 - 0.0017f*(src_id - TILE_WIRE_V02N0701);
-        el.y2 = el.y1;
-
-        g.push_back(el);
-
-        el.y2 = y + switchbox_y1 + 0.0017f*(20 + (dst_id - TILE_WIRE_V02N0701)+ 20 *(dst.location.y%3));
-        el.x1 = el.x2;
-
-        g.push_back(el);
-
-        el.y1 = el.y2;
-        el.x1 =  x + switchbox_x1;
-
-        g.push_back(el);
-    }
     if (src_type == id_WIRE_TYPE_V06 && dst_type == id_WIRE_TYPE_H02) {
-        el.x1 = x + switchbox_x1 + 0.0017f*(16 + (dst_id - TILE_WIRE_H02W0701)+ 20 *(dst.location.x%3));
-        el.y1 = y + switchbox_y1;
-
-        el.x2 = x + switchbox_x1;
-        el.y2 = y + switchbox_y1 + 0.0017f*(96 + (src_id - TILE_WIRE_V06N0303)+ 20 *(y%3));
+        setSource(el,x,y,src,src_type,src_id);
+        setDestination(el,x,y,dst,dst_type,dst_id);
         g.push_back(el);
     }
+
+    if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H02) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = el.x1;
+        el.y2 = y + switchbox_y1 + (switchbox_y2-switchbox_y1)/2 + 0.0017f*(src_id - TILE_WIRE_H02W0701);
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el2.x2;
+        el.y1 = el.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+
+    if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H06) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = el.x1;
+        el.y2 = y + switchbox_y1 + (switchbox_y2-switchbox_y1)/2 + 0.0017f*(src_id - TILE_WIRE_H02W0701);
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el2.x2;
+        el.y1 = el.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+
+    if (src_type == id_WIRE_TYPE_H06 && dst_type == id_WIRE_TYPE_H06) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = el.x1;
+        el.y2 = y + switchbox_y1 + (switchbox_y2-switchbox_y1)/2 - 0.0017f*(src_id - TILE_WIRE_H06W0303);
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el2.x2;
+        el.y1 = el.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+
+    if (src_type == id_WIRE_TYPE_H06 && dst_type == id_WIRE_TYPE_H02) {
+        setSource(el,x,y,src,src_type,src_id);
+        el.x2 = el.x1;
+        el.y2 = y + switchbox_y1 + (switchbox_y2-switchbox_y1)/2 - 0.0017f*(src_id - TILE_WIRE_H06W0303);
+        g.push_back(el);
+
+        GraphicElement el2;
+        el2.type = GraphicElement::TYPE_LINE;
+        el2.style = style;
+
+        setDestination(el2,x,y,dst,dst_type,dst_id);
+
+        el.x1 = el2.x2;
+        el.y1 = el.y2;
+        g.push_back(el);
+
+        el2.x1 = el.x1;
+        el2.y1 = el.y1;
+        g.push_back(el2);
+    }
+
 }

 NEXTPNR_NAMESPACE_END


INTEGRATION: CWS dba30b (1.8.4); FILE MERGED 2008/04/15 22:14:03 fs 1.8.4.2: RESYNC: (1.8-1.10); FILE MERGED 2008/03/16 14:06:14 fs 1.8.4.1: #i86996# support for passing additional parameters

--- dbaccess/source/ui/misc/databaseobjectview.cxx
+++ dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -7,7 +7,7 @@
  * OpenOffice.org - a multi-platform office productivity suite
  *
  * $RCSfile: databaseobjectview.cxx,v $
- * $Revision: 1.10 $
+ * $Revision: 1.11 $
  *
  * This file is part of OpenOffice.org.
  *
@@ -76,6 +76,9 @@
 #endif
 #ifndef _COMPHELPER_SEQUENCE_HXX_
 #include <comphelper/sequence.hxx>
+#endif
+#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX
+#include <comphelper/namedvaluecollection.hxx>
 #endif

 #ifndef _CONNECTIVITY_DBTOOLS_HXX_
@@ -148,7 +151,11 @@
     {
         Sequence< PropertyValue > aDispatchArgs;
         fillDispatchArgs( aDispatchArgs, _rDataSource, _rObjectName );
-        return doDispatch( ::comphelper::concatSequences( aDispatchArgs, _rCreationArgs ) );
+
+        ::comphelper::NamedValueCollection aDispArgs( aDispatchArgs );
+        aDispArgs.merge( _rCreationArgs, true );
+
+        return doDispatch( aDispArgs.getPropertyValues() );
     }

     //----------------------------------------------------------------------
@@ -189,9 +196,9 @@
                 if ( xReturn.is() )
                     xReturn.set(m_xFrameLoader,UNO_QUERY);
             }
-            catch(Exception&)
+            catch( const Exception& )
             {
-                OSL_ENSURE(sal_False, "DatabaseObjectView::getDispatcher: caught an exception while loading the component!");
+                DBG_UNHANDLED_EXCEPTION();
             }
         }
         return xReturn;


Add outline box to ROI marker.

Add outline box to ROI marker.

--- rapid_perception/src/box3d_roi_server.cpp
+++ rapid_perception/src/box3d_roi_server.cpp
@@ -4,12 +4,16 @@
 #include <string>

 #include "boost/bind.hpp"
+#include "geometry_msgs/PoseStamped.h"
+#include "geometry_msgs/Vector3.h"
 #include "interactive_markers/interactive_marker_server.h"
 #include "rapid_msgs/Roi3D.h"
 #include "visualization_msgs/InteractiveMarker.h"
 #include "visualization_msgs/InteractiveMarkerControl.h"
 #include "visualization_msgs/InteractiveMarkerFeedback.h"
 #include "visualization_msgs/Marker.h"
+
+#include "rapid_viz/markers.h"

 using interactive_markers::InteractiveMarkerServer;
 using rapid_msgs::Roi3D;
@@ -43,8 +47,18 @@
   box.color.b = 0.5;
   box.color.a = 0.5;

+  geometry_msgs::PoseStamped ps;
+  // ps.header.frame_id = base_frame_;
+  ps.pose.orientation.w = 1;
+  geometry_msgs::Vector3 scale;
+  scale.x = scale_x;
+  scale.y = scale_y;
+  scale.z = scale_z;
+  Marker outline_box = rapid::viz::OutlineBox(ps, scale);
+
   InteractiveMarkerControl control;
   control.markers.push_back(box);
+  control.markers.push_back(outline_box);
   control.always_visible = true;
   control.interaction_mode = InteractiveMarkerControl::NONE;

@@ -119,8 +133,8 @@
   Marker arrow;
   arrow.type = Marker::ARROW;
   arrow.scale.x = 0.05;
-  arrow.scale.y = 0.025;
-  arrow.scale.z = 0.025;
+  arrow.scale.y = 0.05;
+  arrow.scale.z = 0.05;
   if (dim == "x") {
     arrow.color.r = 1;
   } else if (dim == "y") {
@@ -128,7 +142,7 @@
   } else if (dim == "z") {
     arrow.color.b = 1;
   }
-  arrow.color.a = 1;
+  arrow.color.a = 0.9;

   double sign = 1;
   if (polarity == "neg") {


INTEGRATION: CWS dba24b (1.4.130); FILE MERGED 2007/08/27 10:42:05 fs 1.4.130.1: some re-factoring in preparation of #i80930#: moved declaration from .hxx to .cxx

--- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
+++ dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: AdvancedSettingsDlg.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 07:31:51 $
+ *  last change: $Author: hr $ $Date: 2007-11-01 15:38:20 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -36,23 +36,9 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_dbaccess.hxx"

-#ifndef _DBU_REGHELPER_HXX_
+#include "unoadmin.hxx"
 #include "dbu_reghelper.hxx"
-#endif
-#ifndef _DBAUI_ADVANCEDSETTINGSDLG_HXX
-#include "AdvancedSettingsDlg.hxx"
-#endif
-#ifndef DBAUI_ADVANCEDPAGEDLG_HXX
-#include "AdvancedPageDlg.hxx"
-#endif
-
-
-using namespace dbaui;
-
-extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog()
-{
-    static OMultiInstanceAutoRegistration< OAdvancedSettingsDialog > aAutoRegistration;
-}
+#include "advancedsettingsdlg.hxx"

 //.........................................................................
 namespace dbaui
@@ -63,79 +49,119 @@
     using namespace ::com::sun::star::lang;
     using namespace ::com::sun::star::beans;

-//=========================================================================
-//-------------------------------------------------------------------------
-OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XMultiServiceFactory >& _rxORB)
-    :ODatabaseAdministrationDialog(_rxORB)
-{
-}
-//-------------------------------------------------------------------------
-Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId(  ) throw(RuntimeException)
-{
-    static ::cppu::OImplementationId aId;
-    return aId.getImplementationId();
-}
+    //=========================================================================
+    //= OAdvancedSettingsDialog
+    //=========================================================================
+    class OAdvancedSettingsDialog
+            :public ODatabaseAdministrationDialog
+            ,public ::comphelper::OPropertyArrayUsageHelper< OAdvancedSettingsDialog >
+    {

-//-------------------------------------------------------------------------
-Reference< XInterface > SAL_CALL OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
-{
-    return *(new OAdvancedSettingsDialog(_rxFactory));
-}
+    protected:
+        OAdvancedSettingsDialog(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB);

-//-------------------------------------------------------------------------
-::rtl::OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException)
-{
-    return getImplementationName_Static();
-}
+    public:
+        // XTypeProvider
+        virtual ::com::sun::star::uno::Sequence<sal_Int8> SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);

-//-------------------------------------------------------------------------
-::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException)
-{
-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdvancedSettingsDialog"));
-}
+        // XServiceInfo
+        virtual ::rtl::OUString SAL_CALL getImplementationName() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException);

-//-------------------------------------------------------------------------
-::comphelper::StringSequence SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException)
-{
-    return getSupportedServiceNames_Static();
-}
+        // XServiceInfo - static methods
+        static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+        static ::rtl::OUString getImplementationName_Static(void) throw( ::com::sun::star::uno::RuntimeException );
+        static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >
+                SAL_CALL Create(const ::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >&);

-//-------------------------------------------------------------------------
-::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
-{
-    ::comphelper::StringSequence aSupported(1);
-    aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"));
-    return aSupported;
-}
+        // XPropertySet
+        virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo>  SAL_CALL getPropertySetInfo() throw(::com::sun::star::uno::RuntimeException);
+        virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();

-//-------------------------------------------------------------------------
-Reference<XPropertySetInfo>  SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() throw(RuntimeException)
-{
-    Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
-    return xInfo;
-}
+        // OPropertyArrayUsageHelper
+        virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const;
+    protected:
+    // OGenericUnoDialog overridables
+        virtual Dialog* createDialog(Window* _pParent);
+    };

-//-------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper& OAdvancedSettingsDialog::getInfoHelper()
-{
-    return *const_cast<OAdvancedSettingsDialog*>(this)->getArrayHelper();
-}
+    //=========================================================================
+    //-------------------------------------------------------------------------
+    OAdvancedSettingsDialog::OAdvancedSettingsDialog(const Reference< XMultiServiceFactory >& _rxORB)
+        :ODatabaseAdministrationDialog(_rxORB)
+    {
+    }
+    //-------------------------------------------------------------------------
+    Sequence<sal_Int8> SAL_CALL OAdvancedSettingsDialog::getImplementationId(  ) throw(RuntimeException)
+    {
+        static ::cppu::OImplementationId aId;
+        return aId.getImplementationId();
+    }

-//------------------------------------------------------------------------------
-::cppu::IPropertyArrayHelper* OAdvancedSettingsDialog::createArrayHelper( ) const
-{
-    Sequence< Property > aProps;
-    describeProperties(aProps);
-    return new ::cppu::OPropertyArrayHelper(aProps);
-}
-//------------------------------------------------------------------------------
-Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent)
-{
-    OAdvancedTabPageDlg* pDlg = new OAdvancedTabPageDlg(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection);
-    return pDlg;
-}
+    //-------------------------------------------------------------------------
+    Reference< XInterface > SAL_CALL OAdvancedSettingsDialog::Create(const Reference< XMultiServiceFactory >& _rxFactory)
+    {
+        return *(new OAdvancedSettingsDialog(_rxFactory));
+    }
+
+    //-------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL OAdvancedSettingsDialog::getImplementationName() throw(RuntimeException)
+    {
+        return getImplementationName_Static();
+    }
+
+    //-------------------------------------------------------------------------
+    ::rtl::OUString OAdvancedSettingsDialog::getImplementationName_Static() throw(RuntimeException)
+    {
+        return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbu.OAdvancedSettingsDialog"));
+    }
+
+    //-------------------------------------------------------------------------
+    ::comphelper::StringSequence SAL_CALL OAdvancedSettingsDialog::getSupportedServiceNames() throw(RuntimeException)
+    {
+        return getSupportedServiceNames_Static();
+    }
+
+    //-------------------------------------------------------------------------
+    ::comphelper::StringSequence OAdvancedSettingsDialog::getSupportedServiceNames_Static() throw(RuntimeException)
+    {
+        ::comphelper::StringSequence aSupported(1);
+        aSupported.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.AdvancedDatabaseSettingsDialog"));
+        return aSupported;
+    }
+
+    //-------------------------------------------------------------------------
+    Reference<XPropertySetInfo>  SAL_CALL OAdvancedSettingsDialog::getPropertySetInfo() throw(RuntimeException)
+    {
+        Reference<XPropertySetInfo>  xInfo( createPropertySetInfo( getInfoHelper() ) );
+        return xInfo;
+    }
+
+    //-------------------------------------------------------------------------
+    ::cppu::IPropertyArrayHelper& OAdvancedSettingsDialog::getInfoHelper()
+    {
+        return *const_cast<OAdvancedSettingsDialog*>(this)->getArrayHelper();
+    }
+
+    //------------------------------------------------------------------------------
+    ::cppu::IPropertyArrayHelper* OAdvancedSettingsDialog::createArrayHelper( ) const
+    {
+        Sequence< Property > aProps;
+        describeProperties(aProps);
+        return new ::cppu::OPropertyArrayHelper(aProps);
+    }
+    //------------------------------------------------------------------------------
+    Dialog* OAdvancedSettingsDialog::createDialog(Window* _pParent)
+    {
+        AdvancedSettingsDialog* pDlg = new AdvancedSettingsDialog(_pParent, m_pDatasourceItems, m_xORB,m_aInitialSelection);
+        return pDlg;
+    }

 //.........................................................................
 }   // namespace dbaui
 //.........................................................................

+extern "C" void SAL_CALL createRegistryInfo_OAdvancedSettingsDialog()
+{
+    static ::dbaui::OMultiInstanceAutoRegistration< ::dbaui::OAdvancedSettingsDialog > aAutoRegistration;
+}


INTEGRATION: CWS pchfix02 (1.6.20); FILE MERGED 2006/09/01 17:55:47 kaib 1.6.20.1: #i68856# Added header markers and pch files

--- ucb/source/ucp/hierarchy/hierarchyservices.cxx
+++ ucb/source/ucp/hierarchy/hierarchyservices.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: hierarchyservices.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: hr $ $Date: 2006-06-20 05:29:34 $
+ *  last change: $Author: obo $ $Date: 2006-09-17 13:56:48 $
  *
  *  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_ucb.hxx"

 #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>


use realize instead of assemble when setting coordinate value and the model has no constraints

git-svn-id: 9e047e1e624cce0a2485e750063112e834f85522@6069 fc29be9c-2cb0-420d-b520-73dbd18add6e

--- OpenSim/Simulation/SimbodyEngine/Coordinate.cpp
+++ OpenSim/Simulation/SimbodyEngine/Coordinate.cpp
@@ -485,7 +485,7 @@
 			_model->assemble(s, this, weight);
 		}
 		else
-			_model->assemble(s, this, 1.0);
+			_model->getMultibodySystem().realize(s, Stage::Position );
 	}

 	if (!_locked) {


Don't show Frames by default, they'll be individually controlled.

--- OpenSim/Tests/VisualizeModel/VisualizeModel.cpp
+++ OpenSim/Tests/VisualizeModel/VisualizeModel.cpp
@@ -53,7 +53,7 @@
         Model osimModel(modelFile);
         //osimModel.print("updated_" + modelFile);
         osimModel.setUseVisualizer(true);
-        osimModel.updDisplayHints().set_show_frames(true);
+        osimModel.updDisplayHints().set_show_frames(false);
         SimTK::State& si = osimModel.initSystem();
         osimModel.equilibrateMuscles(si);
         osimModel.getMultibodySystem().realize(si, Stage::Velocity);


Simplify file properties structure

Simplify file properties structure

--- src/fileproperties.cpp
+++ src/fileproperties.cpp
@@ -1,40 +0,0 @@
-/*
- * This File is part of Davix, The IO library for HTTP based protocols
- * Copyright (C) 2013  Adrien Devresse <adrien.devresse@cern.ch>, CERN
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * 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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
-*/
-
-#include "fileproperties.hpp"
-
-namespace Davix {
-
-FileProperties::FileProperties() :
-    filename(),
-    req_status(0),
-    nlink(0),
-    uid(0),
-    gid(0),
-    size(0),
-    mode(0),
-    atime(0),
-    mtime(0),
-    ctime(0){
-
-}
-
-
-} // namespace Davix


Make sure comparison widths match.

Make sure comparison widths match.

--- elab_net.cc
+++ elab_net.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: elab_net.cc,v 1.163 2005/05/10 05:10:40 steve Exp $"
+#ident "$Id: elab_net.cc,v 1.164 2005/05/19 03:51:38 steve Exp $"
 #endif

 # include "config.h"
@@ -451,7 +451,7 @@
 	   (so that the eval_tree method can reduce constant
 	   expressions, including parameters) then turn those results
 	   into synthesized nets. */
-      NetExpr*lexp = left_->elaborate_expr(des, scope);
+      NetExpr*lexp = elab_and_eval(des, scope, left_);
       if (lexp == 0) {
 	    cerr << get_line() << ": error: Cannot elaborate ";
 	    left_->dump(cerr);
@@ -459,12 +459,7 @@
 	    return 0;
       }

-      if (NetExpr*tmp = lexp->eval_tree()) {
-	    delete lexp;
-	    lexp = tmp;
-      }
-
-      NetExpr*rexp = right_->elaborate_expr(des, scope);
+      NetExpr*rexp = elab_and_eval(des, scope, right_);
       if (rexp == 0) {
 	    cerr << get_line() << ": error: Cannot elaborate ";
 	    right_->dump(cerr);
@@ -472,10 +467,16 @@
 	    return 0;
       }

-      if (NetExpr*tmp = rexp->eval_tree()) {
-	    delete rexp;
-	    rexp = tmp;
-      }
+	/* Choose the operand width to be the width of the widest
+	   self-determined operand. */
+      unsigned operand_width = lexp->expr_width();
+      if (rexp->expr_width() > operand_width)
+	    operand_width = rexp->expr_width();
+
+      lexp->set_width(operand_width);
+      lexp = pad_to_width(lexp, operand_width);
+      rexp->set_width(operand_width);
+      rexp = pad_to_width(rexp, operand_width);

       NetNet*lsig = 0;
       NetNet*rsig = 0;
@@ -2460,6 +2461,9 @@

 /*
  * $Log: elab_net.cc,v $
+ * Revision 1.164  2005/05/19 03:51:38  steve
+ *  Make sure comparison widths match.
+ *
  * Revision 1.163  2005/05/10 05:10:40  steve
  *  Make sig-eq-constant optimization more effective.
  *


static variables of explicitely specialized classes need not be
prefixed by "template<>"

git-svn-id: 31d9d2f6432a47c86a3640814024c107794ea77c@4633 0785d39b-7218-0410-832d-ea1e28bc413d

--- deal.II/deal.II/source/grid/grid_reordering.cc
+++ deal.II/deal.II/source/grid/grid_reordering.cc
@@ -25,16 +25,9 @@

 // static variables
-template <>
 const unsigned int GridReorderingInfo<2>::rotational_states_of_cells;
-
-template <>
 const unsigned int GridReorderingInfo<2>::rotational_states_of_faces;
-
-template <>
 const unsigned int GridReorderingInfo<3>::rotational_states_of_cells;
-
-template <>
 const unsigned int GridReorderingInfo<3>::rotational_states_of_faces;

 template <int dim>


fix NXDOMAIN problems

fix NXDOMAIN problems

--- iocore/hostdb/HostDB.cc
+++ iocore/hostdb/HostDB.cc
@@ -441,6 +441,7 @@
     action = opt.cont;
   } else {
     // ink_assert(!"this sucks");
+    ink_zero(action);
     action.mutex = mutex;
   }
 }
@@ -1591,17 +1592,25 @@
   EThread *t = e ? e->ethread : this_ethread();

   MUTEX_TRY_LOCK(lock, action.mutex, t);
+
+  // Separating lock checks here to make sure things don't break
+  // when we check if the action is cancelled.
+  if (!lock.is_locked()) {
+    mutex->thread_holding->schedule_in(this, HOST_DB_RETRY_PERIOD);
+    return EVENT_CONT;
+  }
+
+  if (action.cancelled) {
+    hostdb_cont_free(this);
+    return EVENT_DONE;
+  }
+
   // Go ahead and grab the continuation mutex or just grab the action mutex again of there is no continuation mutex
   MUTEX_TRY_LOCK(lock2, (action.continuation && action.continuation->mutex) ? action.continuation->mutex : action.mutex, t);
   // Don't continue unless we have both mutexes
-  if (!lock.is_locked() || !lock2.is_locked()) {
+  if (!lock2.is_locked()) {
     mutex->thread_holding->schedule_in(this, HOST_DB_RETRY_PERIOD);
     return EVENT_CONT;
-  }
-
-  if (action.cancelled) {
-    hostdb_cont_free(this);
-    return EVENT_DONE;
   }

   if (!hostdb_enable || (!*hash.host_name && !hash.ip.isValid())) {


INTEGRATION: CWS changefileheader (1.9.222); FILE MERGED 2008/04/01 15:35:00 thb 1.9.222.3: #i85898# Stripping all external header guards 2008/04/01 12:38:58 thb 1.9.222.2: #i85898# Stripping all external header guards 2008/03/31 13:58:08 rt 1.9.222.1: #i87441# Change license header to LPGL v3.

--- sd/source/ui/inc/AccessibleOutlineView.hxx
+++ sd/source/ui/inc/AccessibleOutlineView.hxx
@@ -1,48 +1,38 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
- *  $RCSfile: AccessibleOutlineView.hxx,v $
+ * Copyright 2008 by Sun Microsystems, Inc.
  *
- *  $Revision: 1.9 $
+ * OpenOffice.org - a multi-platform office productivity suite
  *
- *  last change: $Author: rt $ $Date: 2007-04-25 14:40:45 $
+ * $RCSfile: AccessibleOutlineView.hxx,v $
+ * $Revision: 1.10 $
  *
- *  The Contents of this file are made available subject to
- *  the terms of GNU Lesser General Public License Version 2.1.
+ * This file is part of OpenOffice.org.
  *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
  *
- *    GNU Lesser General Public License Version 2.1
- *    =============================================
- *    Copyright 2005 by Sun Microsystems, Inc.
- *    901 San Antonio Road, Palo Alto, CA 94303, USA
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
  *
- *    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
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/

 #ifndef SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_VIEW_HXX
 #define SD_ACCESSIBILITY_ACCESSIBLE_OUTLINE_VIEW_HXX

-#ifndef SD_ACCESSIBILITY_ACCESSIBLE_DOCUMENT_VIEW_BASE_HXX
 #include "AccessibleDocumentViewBase.hxx"
-#endif
-
-#ifndef _SVX_ACCESSILE_TEXT_HELPER_HXX_
 #include <svx/AccessibleTextHelper.hxx>
-#endif

 namespace sd {
 class OutlineViewShell;


INTEGRATION: CWS changefileheader (1.7.10); FILE MERGED 2008/03/28 15:51:24 rt 1.7.10.1: #i87441# Change license header to LPGL v3.

--- unodevtools/source/unodevtools/typemanager.cxx
+++ unodevtools/source/unodevtools/typemanager.cxx
@@ -1,35 +1,30 @@
 /*************************************************************************
  *
- *  OpenOffice.org - a multi-platform office productivity suite
- *
- *  $RCSfile: typemanager.cxx,v $
- *
- *  $Revision: 1.7 $
- *
- *  last change: $Author: vg $ $Date: 2007-10-15 12:24:26 $
- *
- *  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
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: typemanager.cxx,v $
+ * $Revision: 1.8 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org 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 version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
  *
  ************************************************************************/


Don't care about H264 profiles when creating Android decoder.

Fixes problem in Android's legacy video decoder factory.

Bug: b/111416606
Change-Id: Id6f26d559e5055eb7808beb600b9550ebd4ca4b7
Reviewed-on: https://webrtc-review.googlesource.com/88560
Commit-Queue: Magnus Jedvert <9507adee858471ab168c339dc72b814b168c081b@webrtc.org>
Reviewed-by: Magnus Jedvert <9507adee858471ab168c339dc72b814b168c081b@webrtc.org>
Cr-Commit-Position: 972c6d2dc6dd5efdad1377c0d224e03eb8f276f7@{#23967}

--- sdk/android/src/jni/androidmediadecoder.cc
+++ sdk/android/src/jni/androidmediadecoder.cc
@@ -814,7 +814,7 @@
     return nullptr;
   }
   for (SdpVideoFormat supported_format : supported_formats_) {
-    if (supported_format == format) {
+    if (supported_format.name == format.name) {
       ALOGD << "Create HW video decoder for type " << format.name;
       JNIEnv* jni = AttachCurrentThreadIfNeeded();
       ScopedLocalRefFrame local_ref_frame(jni);


Empty -> Ramp. Fix texture updates

Empty -> Ramp. Fix texture updates

--- plugins/gui/src/TransferFunctionEditor.cpp
+++ plugins/gui/src/TransferFunctionEditor.cpp
@@ -109,7 +109,14 @@

 std::array<std::tuple<std::string, PresetGenerator>, 12> PRESETS = {
     std::make_tuple("Select...", [](auto& nodes, auto n) {}),
-    std::make_tuple("Empty", [](auto& nodes, auto n) { nodes.clear(); }),
+    std::make_tuple("Ramp",
+        [](auto& nodes, auto n) {
+            nodes.clear();
+            std::array<float, TFP_VAL_CNT> zero = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.05f};
+            std::array<float, TFP_VAL_CNT> one = {1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.05f};
+            nodes.emplace_back(zero);
+            nodes.emplace_back(one);
+        }),
     std::make_tuple("Inferno", ColormapAdapter<256>(InfernoColorMap)),
     std::make_tuple("Magma", ColormapAdapter<256>(MagmaColorMap)),
     std::make_tuple("Plasma", ColormapAdapter<256>(PlasmaColorMap)),
@@ -374,10 +381,26 @@
         } else if (this->mode == param::TransferFunctionParam::InterpolationMode::GAUSS) {
             param::TransferFunctionParam::GaussInterpolation(this->texturePixels, this->textureSize, this->nodes);
         }
+
+        // Delete old texture.
         if (this->textureId != 0) {
             glDeleteTextures(1, &this->textureId);
         }
         this->textureId = 0;
+
+        // Upload texture.
+        glGenTextures(1, &this->textureId);
+        glBindTexture(GL_TEXTURE_2D, this->textureId);
+
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+
+        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, textureSize, 1, 0, GL_RGBA, GL_FLOAT, this->texturePixels.data());
+
+        glBindTexture(GL_TEXTURE_2D, 0);
+
         this->textureInvalid = false;
     }

@@ -413,30 +436,15 @@
     ImVec2 pos = ImGui::GetCursorScreenPos();
     const size_t textureSize = this->texturePixels.size() / 4;

-    if (textureSize == 0) {
+    if (textureSize == 0 || this->textureId == 0) {
         // Reserve layout space and draw a black background rectangle.
         ImDrawList* drawList = ImGui::GetWindowDrawList();
         ImGui::Dummy(size);
         drawList->AddRectFilled(pos, ImVec2(pos.x + size.x, pos.y + size.y), IM_COL32(0, 0, 0, 255), 0.0f, 10);
-    }
-
-    if (this->textureId == 0) {
-        // Upload texture.
-        glGenTextures(1, &this->textureId);
-        glBindTexture(GL_TEXTURE_2D, this->textureId);
-
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-        glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-        glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, textureSize, 1, 0, GL_RGBA, GL_FLOAT, this->texturePixels.data());
-
-        glBindTexture(GL_TEXTURE_2D, 0);
-    }
-
-    // Draw texture as image.
-    ImGui::Image(reinterpret_cast<ImTextureID>(this->textureId), size);
+    } else {
+        // Draw texture as image.
+        ImGui::Image(reinterpret_cast<ImTextureID>(this->textureId), size);
+    }

     // Draw tooltip, if requested.
     if (ImGui::IsItemHovered()) {