diff -Nru librecad-2.0.1+nolibs/debian/changelog librecad-2.0.2+nolibs/debian/changelog --- librecad-2.0.1+nolibs/debian/changelog 2014-01-17 20:18:05.000000000 +0000 +++ librecad-2.0.2+nolibs/debian/changelog 2014-01-27 16:42:14.000000000 +0000 @@ -1,3 +1,9 @@ +librecad (2.0.2+nolibs-1) unstable; urgency=low + + * New upstream release. + + -- Scott Howard Mon, 27 Jan 2014 11:41:50 -0500 + librecad (2.0.1+nolibs-1) unstable; urgency=low * New upstream release. diff -Nru librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_entities.cpp librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_entities.cpp --- librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_entities.cpp 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_entities.cpp 2014-01-09 18:31:10.000000000 +0000 @@ -938,8 +938,7 @@ break; case 10: { vertexpoint = new DRW_Coord(); - std::unique_ptr ptr(vertexpoint); - vertexlist.push_back(std::move(ptr)); + vertexlist.push_back(vertexpoint); vertexpoint->x = reader->getDouble(); break; } case 20: diff -Nru librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_entities.h librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_entities.h --- librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_entities.h 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_entities.h 2014-01-09 18:31:10.000000000 +0000 @@ -16,7 +16,6 @@ #include #include -#include #include "drw_base.h" class dxfReader; @@ -1134,7 +1133,7 @@ DRW_Coord offsetblock; /*!< Offset of last leader vertex from block, code 212, 222 & 232 */ DRW_Coord offsettext; /*!< Offset of last leader vertex from annotation, code 213, 223 & 233 */ - std::vector > vertexlist; /*!< vertex points list, code 10, 20 & 30 */ + std::vector vertexlist; /*!< vertex points list, code 10, 20 & 30 */ private: DRW_Coord *vertexpoint; /*!< current control point to add data */ diff -Nru librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_objects.cpp librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_objects.cpp --- librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_objects.cpp 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_objects.cpp 2014-01-09 18:31:10.000000000 +0000 @@ -532,7 +532,7 @@ name = reader->getString(); if (version < DRW::AC1015 && name == "$DIMUNIT") name="$DIMLUNIT"; - vars[name].reset(curr); + vars[name]=curr; break; case 1: curr->addString(reader->getUtf8String()); @@ -924,9 +924,10 @@ bool DRW_Header::getDouble(std::string key, double *varDouble){ bool result = false; - auto it=vars.find( key); + std::map::iterator it; + it=vars.find( key); if (it != vars.end()) { - auto& var = (*it).second; + DRW_Variant *var = (*it).second; if (var->type == DRW_Variant::DOUBLE) { *varDouble = var->content.d; result = true; @@ -938,9 +939,10 @@ bool DRW_Header::getInt(std::string key, int *varInt){ bool result = false; - auto it=vars.find( key); + std::map::iterator it; + it=vars.find( key); if (it != vars.end()) { - auto& var = (*it).second; + DRW_Variant *var = (*it).second; if (var->type == DRW_Variant::INTEGER) { *varInt = var->content.i; result = true; @@ -952,9 +954,10 @@ bool DRW_Header::getStr(std::string key, std::string *varStr){ bool result = false; - auto it=vars.find( key); + std::map::iterator it; + it=vars.find( key); if (it != vars.end()) { - auto& var = (*it).second; + DRW_Variant *var = (*it).second; if (var->type == DRW_Variant::STRING) { *varStr = *var->content.s; result = true; @@ -966,9 +969,10 @@ bool DRW_Header::getCoord(std::string key, DRW_Coord *varCoord){ bool result = false; - auto it=vars.find( key); + std::map::iterator it; + it=vars.find( key); if (it != vars.end()) { - auto& var = (*it).second; + DRW_Variant *var = (*it).second; if (var->type == DRW_Variant::COORD) { *varCoord = *var->content.v; result = true; diff -Nru librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_objects.h librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_objects.h --- librecad-2.0.1+nolibs/libraries/libdxfrw/src/drw_objects.h 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/libraries/libdxfrw/src/drw_objects.h 2014-01-09 18:31:10.000000000 +0000 @@ -17,7 +17,6 @@ #include #include #include -#include #include "drw_base.h" class dxfReader; @@ -385,11 +384,11 @@ bool getCoord(std::string key, DRW_Coord *varStr); public: - std::map > vars; + std::map vars; private: std::string comments; std::string name; - DRW_Variant* curr; + DRW_Variant *curr; int version; //to use on read }; diff -Nru librecad-2.0.1+nolibs/libraries/libdxfrw/src/libdxfrw.cpp librecad-2.0.2+nolibs/libraries/libdxfrw/src/libdxfrw.cpp --- librecad-2.0.1+nolibs/libraries/libdxfrw/src/libdxfrw.cpp 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/libraries/libdxfrw/src/libdxfrw.cpp 2014-01-09 18:31:10.000000000 +0000 @@ -950,7 +950,7 @@ writer->writeDouble(76, ent->vertnum); writer->writeDouble(76, ent->vertexlist.size()); for (unsigned int i=0; ivertexlist.size(); i++) { - DRW_Coord *vert = ent->vertexlist.at(i).get(); + DRW_Coord *vert = ent->vertexlist.at(i); writer->writeDouble(10, vert->x); writer->writeDouble(20, vert->y); writer->writeDouble(30, vert->z); diff -Nru librecad-2.0.1+nolibs/librecad/src/lib/filters/rs_filterdxfrw.cpp librecad-2.0.2+nolibs/librecad/src/lib/filters/rs_filterdxfrw.cpp --- librecad-2.0.1+nolibs/librecad/src/lib/filters/rs_filterdxfrw.cpp 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/librecad/src/lib/filters/rs_filterdxfrw.cpp 2014-01-09 18:31:10.000000000 +0000 @@ -25,8 +25,7 @@ #include "rs_filterdxfrw.h" -#include -#include +#include //#include #include "rs_dimaligned.h" @@ -960,7 +959,7 @@ setEntityAttributes(leader, data); for (unsigned int i=0; ivertexlist.size(); i++) { - DRW_Coord *vert = data->vertexlist.at(i).get(); + DRW_Coord *vert = data->vertexlist.at(i); RS_Vector v(vert->x, vert->y); leader->addVertex(v); } @@ -1198,9 +1197,10 @@ container = (RS_Graphic*)currentContainer; } else return; - for (auto it=data->vars.begin() ; it != data->vars.end(); it++ ){ + map::const_iterator it; + for ( it=data->vars.begin() ; it != data->vars.end(); it++ ){ QString key = QString::fromStdString((*it).first); - auto& var = (*it).second; + DRW_Variant *var = (*it).second; switch (var->type) { case DRW_Variant::COORD: container->addVariable(key, @@ -1461,7 +1461,7 @@ void RS_FilterDXFRW::writeHeader(DRW_Header& data){ - DRW_Variant* curr(nullptr); + DRW_Variant *curr; /*TODO $ISOMETRICGRID == $SNAPSTYLE and "GRID on/off" not handled because is part of active vport to save is required read/write VPORT table */ QHashvars = graphic->getVariableDict(); @@ -1474,7 +1474,7 @@ } while (it != vars.end()) { - curr=new DRW_Variant(); + curr = new DRW_Variant(); switch (it.value().getType()) { case RS2::VariableInt: @@ -1501,26 +1501,26 @@ default: break; } - data.vars[it.key().toStdString()].reset(curr); + data.vars[it.key().toStdString()] =curr; ++it; } RS_Vector v = graphic->getMin(); - curr=new DRW_Variant(); + curr = new DRW_Variant(); curr->addCoord(new DRW_Coord()); curr->setCoordX(v.x); curr->setCoordY(v.y); - data.vars["$EXTMIN"].reset(curr); + data.vars["$EXTMIN"] =curr; v = graphic->getMax(); curr = new DRW_Variant(); curr->addCoord(new DRW_Coord()); curr->setCoordX(v.x); curr->setCoordY(v.y); - data.vars["$EXTMAX"].reset(curr); + data.vars["$EXTMAX"] =curr; //when saving a block, there is no active layer. ignore it to avoid crash if(graphic->getActiveLayer()==0) return; curr = new DRW_Variant(); curr->addString( (graphic->getActiveLayer()->getName()).toUtf8().data() ); - data.vars["$CLAYER"].reset(curr); + data.vars["$CLAYER"] =curr; } void RS_FilterDXFRW::writeLTypes(){ @@ -2132,8 +2132,8 @@ // write spline control points: QList cp = s->getControlPoints(); for (int i = 0; i < cp.size(); ++i) { - std::unique_ptr controlpoint(new DRW_Coord()); - sp.controllist.push_back(controlpoint.get()); + DRW_Coord *controlpoint = new DRW_Coord(); + sp.controllist.push_back(controlpoint); controlpoint->x = cp.at(i).x; controlpoint->y = cp.at(i).y; } @@ -2372,24 +2372,24 @@ switch (d->rtti()) { case RS2::EntityDimAligned: { RS_DimAligned* da = (RS_DimAligned*)d; - std::unique_ptr dd(new DRW_DimAligned()); - dim = dd.get() ; + DRW_DimAligned * dd = new DRW_DimAligned(); + dim = dd ; dim->type = 1 +32; dd->setDef1Point(DRW_Coord (da->getExtensionPoint1().x, da->getExtensionPoint1().y, 0.0)); dd->setDef2Point(DRW_Coord (da->getExtensionPoint2().x, da->getExtensionPoint2().y, 0.0)); break; } case RS2::EntityDimDiametric: { RS_DimDiametric* dr = (RS_DimDiametric*)d; - std::unique_ptr dd(new DRW_DimDiametric()); - dim = dd.get(); + DRW_DimDiametric * dd = new DRW_DimDiametric(); + dim = dd ; dim->type = 3+32; dd->setDiameter1Point(DRW_Coord (dr->getDefinitionPoint().x, dr->getDefinitionPoint().y, 0.0)); dd->setLeaderLength(dr->getLeader()); break; } case RS2::EntityDimRadial: { RS_DimRadial* dr = (RS_DimRadial*)d; - std::unique_ptr dd(new DRW_DimRadial()); - dim = dd.get() ; + DRW_DimRadial * dd = new DRW_DimRadial(); + dim = dd ; dim->type = 4+32; dd->setDiameterPoint(DRW_Coord (dr->getDefinitionPoint().x, dr->getDefinitionPoint().y, 0.0)); dd->setLeaderLength(dr->getLeader()); @@ -2397,16 +2397,16 @@ case RS2::EntityDimAngular: { RS_DimAngular* da = (RS_DimAngular*)d; if (da->getDefinitionPoint3() == da->getData().definitionPoint) { - std::unique_ptr dd(new DRW_DimAngular3p()); - dim = dd.get() ; + DRW_DimAngular3p * dd = new DRW_DimAngular3p(); + dim = dd ; dim->type = 5+32; dd->setFirstLine(DRW_Coord (da->getDefinitionPoint().x, da->getDefinitionPoint().y, 0.0)); //13 dd->setSecondLine(DRW_Coord (da->getDefinitionPoint().x, da->getDefinitionPoint().y, 0.0)); //14 dd->SetVertexPoint(DRW_Coord (da->getDefinitionPoint().x, da->getDefinitionPoint().y, 0.0)); //15 dd->setDimPoint(DRW_Coord (da->getDefinitionPoint().x, da->getDefinitionPoint().y, 0.0)); //10 } else { - std::unique_ptr dd(new DRW_DimAngular()); - dim = dd.get() ; + DRW_DimAngular * dd = new DRW_DimAngular(); + dim = dd ; dim->type = 2+32; dd->setFirstLine1(DRW_Coord (da->getDefinitionPoint1().x, da->getDefinitionPoint1().y, 0.0)); //13 dd->setFirstLine2(DRW_Coord (da->getDefinitionPoint2().x, da->getDefinitionPoint2().y, 0.0)); //14 @@ -2416,8 +2416,8 @@ break; } default: { //default to DimLinear RS_DimLinear* dl = (RS_DimLinear*)d; - std::unique_ptr dd(new DRW_DimLinear()); - dim = dd.get() ; + DRW_DimLinear * dd = new DRW_DimLinear(); + dim = dd ; dim->type = 0+32; dd->setDef1Point(DRW_Coord (dl->getExtensionPoint1().x, dl->getExtensionPoint1().y, 0.0)); dd->setDef2Point(DRW_Coord (dl->getExtensionPoint2().x, dl->getExtensionPoint2().y, 0.0)); @@ -2465,13 +2465,11 @@ v!=NULL; v=l->nextEntity(RS2::ResolveNone)) { if (v->rtti()==RS2::EntityLine) { li = (RS_Line*)v; - std::unique_ptr ptr(new DRW_Coord(li->getStartpoint().x, li->getStartpoint().y, 0.0)); - leader.vertexlist.push_back(std::move(ptr)); + leader.vertexlist.push_back(new DRW_Coord(li->getStartpoint().x, li->getStartpoint().y, 0.0)); } } if (li != NULL) { - std::unique_ptr ptr(new DRW_Coord(li->getEndpoint().x, li->getEndpoint().y, 0.0)); - leader.vertexlist.push_back(std::move(ptr)); + leader.vertexlist.push_back(new DRW_Coord(li->getEndpoint().x, li->getEndpoint().y, 0.0)); } dxfW->writeLeader(&leader); } diff -Nru librecad-2.0.1+nolibs/librecad/src/src.pro librecad-2.0.2+nolibs/librecad/src/src.pro --- librecad-2.0.1+nolibs/librecad/src/src.pro 2014-01-05 01:57:33.000000000 +0000 +++ librecad-2.0.2+nolibs/librecad/src/src.pro 2014-01-09 18:31:10.000000000 +0000 @@ -13,7 +13,7 @@ DEFINES -= DWGSUPPORT DEFINES -= JWW_WRITE_SUPPORT -SCMREVISION="2.0.0" +SCMREVISION="2.0.2" # Store intermedia stuff somewhere else GENERATED_DIR = ../../generated/librecad