summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6b7dfbb)
raw | patch | inline | side by side (parent: 6b7dfbb)
author | joncruz <joncruz@users.sourceforge.net> | |
Wed, 16 Jul 2008 03:50:53 +0000 (03:50 +0000) | ||
committer | joncruz <joncruz@users.sourceforge.net> | |
Wed, 16 Jul 2008 03:50:53 +0000 (03:50 +0000) |
15 files changed:
diff --git a/src/bind/javabind.cpp b/src/bind/javabind.cpp
index 7185330e8a1afd7148acb361a78d08c8c0b7f393..e0e246d488d71a858bee1a9b45a516ae3f6ad88d 100644 (file)
--- a/src/bind/javabind.cpp
+++ b/src/bind/javabind.cpp
* This is provided to scripts can load an XML tree into Inkscape.
* If anyone has a smarter way of doing this, please implement.
*/
-jboolean JNICALL documentSet(JNIEnv *env, jobject /*obj*/, jlong /*ptr*/, jstring /*jstr*/)
+jboolean JNICALL documentSet(JNIEnv */*env*/, jobject /*obj*/, jlong /*ptr*/, jstring /*jstr*/)
{
/*
JavaBinderyImpl *bind = (JavaBinderyImpl *)ptr;
index 757b834f7328a6f95cdb981a9d3a57f649e58911..94232810054a6545620527584e9a02be661d4525 100644 (file)
static gchar*
slider_format_falue (GtkScale* scale, gdouble value, gchar *label)
{
+ (void)scale;
return g_strdup_printf("%s %d", label, (int) round(value));
}
diff --git a/src/helper/geom.cpp b/src/helper/geom.cpp
index f509485bda4274de91cfcd873923f52b779f1787..3a8c9078ddc1f3ce16af2c871a4b574e41724f5f 100644 (file)
--- a/src/helper/geom.cpp
+++ b/src/helper/geom.cpp
output.back().append(*cit);
}
else if(Geom::CubicBezier const *cubic_bezier = dynamic_cast<Geom::CubicBezier const*>(&*cit)) {
+ (void)cubic_bezier;
output.back().append(*cit);
}
else {
diff --git a/src/inkview.cpp b/src/inkview.cpp
index 3fc5bd6eb89ba7f736265319d2b0869f3a0345e6..ade2b6d427d39f43ead661870e785dbd7f98e6a3 100644 (file)
--- a/src/inkview.cpp
+++ b/src/inkview.cpp
int sp_main_console (int, char const**) { return 0; }
static int
-sp_svgview_main_delete (GtkWidget *widget, GdkEvent *event, struct SPSlideShow *ss)
+sp_svgview_main_delete (GtkWidget */*widget*/, GdkEvent */*event*/, struct SPSlideShow */*ss*/)
{
gtk_main_quit ();
return FALSE;
}
static int
-sp_svgview_main_key_press (GtkWidget *widget, GdkEventKey *event, struct SPSlideShow *ss)
+sp_svgview_main_key_press (GtkWidget */*widget*/, GdkEventKey *event, struct SPSlideShow *ss)
{
switch (event->keyval) {
case GDK_Up:
}
static int
-sp_svgview_ctrlwin_delete (GtkWidget *widget, GdkEvent *event, void *data)
+sp_svgview_ctrlwin_delete (GtkWidget */*widget*/, GdkEvent */*event*/, void */*data*/)
{
ctrlwin = NULL;
return FALSE;
}
static int
-sp_svgview_show_next_cb (GtkWidget *widget, void *data)
+sp_svgview_show_next_cb (GtkWidget */*widget*/, void *data)
{
sp_svgview_show_next(static_cast<struct SPSlideShow *>(data));
return FALSE;
}
static int
-sp_svgview_show_prev_cb (GtkWidget *widget, void *data)
+sp_svgview_show_prev_cb (GtkWidget */*widget*/, void *data)
{
sp_svgview_show_prev(static_cast<struct SPSlideShow *>(data));
return FALSE;
}
static int
-sp_svgview_goto_first_cb (GtkWidget *widget, void *data)
+sp_svgview_goto_first_cb (GtkWidget */*widget*/, void *data)
{
sp_svgview_goto_first(static_cast<struct SPSlideShow *>(data));
return FALSE;
}
static int
-sp_svgview_goto_last_cb (GtkWidget *widget, void *data)
+sp_svgview_goto_last_cb (GtkWidget */*widget*/, void *data)
{
sp_svgview_goto_last(static_cast<struct SPSlideShow *>(data));
return FALSE;
index 57ba651f42c745c48eb489093d2c65a226c2dd8c..288722a16dcd2aee08b739d420ef015b61feb8bf 100644 (file)
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8A8N, true> {
static const unsigned bpp=4;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
std::memcpy(dest, src, 4);
}
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8A8P, true> {
static const unsigned bpp=4;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
dest[0] = NR_PREMUL_111(src[0], src[3]);
dest[1] = NR_PREMUL_111(src[1], src[3]);
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8, true> {
static const unsigned bpp=3;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
dest[0] = NR_COMPOSEN11_1111(src[0], src[3], 255);
dest[1] = NR_COMPOSEN11_1111(src[1], src[3], 255);
template <>
struct Compose<NR_PIXBLOCK_MODE_A8, true> {
static const unsigned bpp=1;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
dest[0] = src[3];
}
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8A8N, false> {
static const unsigned bpp=4;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
unsigned int ca;
ca = NR_COMPOSEA_112(src[3], dest[3]);
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8A8P, false> {
static const unsigned bpp=4;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
dest[0] = NR_COMPOSENPP_1111(src[0], src[3], dest[0]);
dest[1] = NR_COMPOSENPP_1111(src[1], src[3], dest[1]);
template <>
struct Compose<NR_PIXBLOCK_MODE_R8G8B8, false> {
static const unsigned bpp=3;
-static void compose(NRPixBlock *pb, unsigned char *dest,
- NRPixBlock *spb, unsigned char const *src)
+static void compose(NRPixBlock */*pb*/, unsigned char *dest,
+ NRPixBlock */*spb*/, unsigned char const *src)
{
dest[0] = NR_COMPOSEN11_1111(src[0], src[3], dest[0]);
dest[1] = NR_COMPOSEN11_1111(src[1], src[3], dest[1]);
template <typename Subtype>
static void
-render(NRRenderer *r, NRPixBlock *pb, NRPixBlock *m)
+render(NRRenderer *r, NRPixBlock *pb, NRPixBlock */*m*/)
{
- NRGradientRenderer *gr;
-
- gr = static_cast<NRGradientRenderer *>(r);
+ NRGradientRenderer *gr = static_cast<NRGradientRenderer *>(r);
switch (gr->spread) {
case NR_GRADIENT_SPREAD_REPEAT:
index c182b93aacc988244bf744d2ae8688c529d0622c..f4ece6892d75f42fd964235698d1fdbccab56615 100644 (file)
}
void Path::DoStroke(int off, int N, Shape *dest, bool doClose, double width, JoinType join,
- ButtType butt, double miter, bool justAdd)
+ ButtType butt, double miter, bool /*justAdd*/)
{
if (N <= 1) {
return;
@@ -286,7 +286,7 @@ void Path::DoButt(Shape *dest, double width, ButtType butt, NR::Point pos, NR::P
void Path::DoJoin (Shape *dest, double width, JoinType join, NR::Point pos, NR::Point prev,
- NR::Point next, double miter, double prevL, double nextL,
+ NR::Point next, double miter, double /*prevL*/, double /*nextL*/,
int *stNo, int *enNo)
{
NR::Point pnor = prev.ccw();
@@ -410,7 +410,7 @@ void Path::DoJoin (Shape *dest, double width, JoinType join, NR::Point pos, NR::
void
Path::DoLeftJoin (Shape * dest, double width, JoinType join, NR::Point pos,
- NR::Point prev, NR::Point next, double miter, double prevL, double nextL,
+ NR::Point prev, NR::Point next, double miter, double /*prevL*/, double /*nextL*/,
int &leftStNo, int &leftEnNo,int pathID,int pieceID,double tID)
{
NR::Point pnor=prev.ccw();
}
void
Path::DoRightJoin (Shape * dest, double width, JoinType join, NR::Point pos,
- NR::Point prev, NR::Point next, double miter, double prevL,
- double nextL, int &rightStNo, int &rightEnNo,int pathID,int pieceID,double tID)
+ NR::Point prev, NR::Point next, double miter, double /*prevL*/,
+ double /*nextL*/, int &rightStNo, int &rightEnNo,int pathID,int pieceID,double tID)
{
const NR::Point pnor=prev.ccw();
const NR::Point nnor=next.ccw();
index 7000bb115618530c49ff728bbff8d60281fdd8ea..cacf4c997a7f765e636f0d4e8b0b08416b245f5d 100644 (file)
@@ -982,7 +982,7 @@ Shape::AddContour (Path * dest, int nbP, Path * *orig, int startBord, int curBor
}
int
-Shape::ReFormeLineTo (int bord, int curBord, Path * dest, Path * orig)
+Shape::ReFormeLineTo (int bord, int /*curBord*/, Path * dest, Path * /*orig*/)
{
int nPiece = ebData[bord].pieceID;
int nPath = ebData[bord].pathID;
}
int
-Shape::ReFormeArcTo (int bord, int curBord, Path * dest, Path * from)
+Shape::ReFormeArcTo (int bord, int /*curBord*/, Path * dest, Path * from)
{
int nPiece = ebData[bord].pieceID;
int nPath = ebData[bord].pathID;
}
int
-Shape::ReFormeCubicTo (int bord, int curBord, Path * dest, Path * from)
+Shape::ReFormeCubicTo (int bord, int /*curBord*/, Path * dest, Path * from)
{
int nPiece = ebData[bord].pieceID;
int nPath = ebData[bord].pathID;
}
int
-Shape::ReFormeBezierTo (int bord, int curBord, Path * dest, Path * from)
+Shape::ReFormeBezierTo (int bord, int /*curBord*/, Path * dest, Path * from)
{
int nPiece = ebData[bord].pieceID;
int nPath = ebData[bord].pathID;
index 4e762396e732e0d757a34159f55e22634572a372..528fe395d7f929a22926a3df5608eec20a736694 100644 (file)
-void Shape::QuickScan(float &pos,int &curP, float to, bool doSort, float step)
+void Shape::QuickScan(float &pos,int &curP, float to, bool /*doSort*/, float step)
{
if ( numberOfEdges() <= 1 ) {
return;
-void Shape::DirectQuickScan(float &pos, int &curP, float to, bool doSort, float step)
+void Shape::DirectQuickScan(float &pos, int &curP, float to, bool /*doSort*/, float step)
{
if ( numberOfEdges() <= 1 ) {
return;
index 18f8e3a69ee0209bd3a813a0eaa8d21bd1062511..2d7bfe252d3d023847aa198983eb334dee29d98a 100644 (file)
}
}
void
-Shape::GetWindings (Shape * a, Shape * b, BooleanOp mod, bool brutal)
+Shape::GetWindings (Shape * /*a*/, Shape * /*b*/, BooleanOp /*mod*/, bool brutal)
{
// preparation du parcours
for (int i = 0; i < numberOfEdges(); i++)
bool
Shape::TesteIntersection (Shape * ils, Shape * irs, int ilb, int irb,
NR::Point &atx, double &atL, double &atR,
- bool onlyDiff)
+ bool /*onlyDiff*/)
{
int lSt = ils->getEdge(ilb).st, lEn = ils->getEdge(ilb).en;
int rSt = irs->getEdge(irb).st, rEn = irs->getEdge(irb).en;
}
void
-Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * shapeHead,
- int edgeHead)
+Shape::CheckAdjacencies (int lastPointNo, int lastChgtPt, Shape * /*shapeHead*/,
+ int /*edgeHead*/)
{
for (unsigned int cCh = 0; cCh < chgts.size(); cCh++)
{
}
void
-Shape::Avance (int lastPointNo, int lastChgtPt, Shape * lS, int lB, Shape * a,
+Shape::Avance (int lastPointNo, int lastChgtPt, Shape * lS, int lB, Shape * /*a*/,
Shape * b, BooleanOp mod)
{
double dd = HalfRound (1);
index 96cd81ee6c0f7786726c68cc2998f930c7389475..8058e0452bd434dc8b54ecae5e241c910ec7c5e8 100644 (file)
return new PathDescrMoveTo(*this);
}
-void PathDescrMoveTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &last) const
+void PathDescrMoveTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &/*last*/) const
{
s << "M " << p[NR::X] << " " << p[NR::Y] << " ";
}
s << " m " << p[NR::X] << " " << p[NR::Y];
}
-void PathDescrLineTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &last) const
+void PathDescrLineTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &/*last*/) const
{
s << "L " << p[NR::X] << " " << p[NR::Y] << " ";
}
p = p * t;
}
-void PathDescrArcTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &last) const
+void PathDescrArcTo::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &/*last*/) const
{
s << "A "
<< rx << " "
return new PathDescrForced(*this);
}
-void PathDescrClose::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &last) const
+void PathDescrClose::dumpSVG(Inkscape::SVGOStringStream& s, NR::Point const &/*last*/) const
{
s << "z ";
}
index 0e45676635364b8c4d030b35ca80fa62c0e255b0..c6c295e333e7fc31ede023e39b0153cfb08ba987 100644 (file)
int
SweepTree::InsertAt(SweepTreeList &list, SweepEventQueue &queue,
- Shape *iDst, SweepTree *insNode, int fromPt,
+ Shape */*iDst*/, SweepTree *insNode, int fromPt,
bool rebalance, bool sweepSens)
{
if (list.racine == NULL)
evt[RIGHT]->sweep[LEFT] = to;
}
+// TODO check if ignoring these parameters is bad
void
-SweepTree::SwapWithRight(SweepTreeList &list, SweepEventQueue &queue)
+SweepTree::SwapWithRight(SweepTreeList &/*list*/, SweepEventQueue &/*queue*/)
{
SweepTree *tL = this;
SweepTree *tR = static_cast<SweepTree *>(elem[RIGHT]);
}
void
-SweepTree::Avance(Shape *dstPts, int curPoint, Shape *a, Shape *b)
+SweepTree::Avance(Shape */*dstPts*/, int /*curPoint*/, Shape */*a*/, Shape */*b*/)
{
return;
/* if ( curPoint != startPoint ) {
index 85db5c1c7c77f3693f0b15f95c76292d5090695e..89da4efe396d45de064320658ed537232f4cfa92 100644 (file)
g_print ("Distance: %8.2f\n", length);
Point C, D;
- for (int i = 0; i < length; i+=mark_distance) {
+ for (int i = 0; i < length; i += static_cast<int>(mark_distance)) {
C = A + dir * i;
D = C + n;
Piecewise<D2<SBasis> > seg(D2<SBasis>(Linear(C[X], D[X]), Linear(C[Y], D[Y])));
diff --git a/src/live_effects/parameter/pointparam-knotholder.cpp b/src/live_effects/parameter/pointparam-knotholder.cpp
index 06e527ffd56585a48c1f5403f33ed1568ff809bb..3ab07a9517710e21b184169f360a31330dbe9c68 100644 (file)
PointParamKnotHolder::add_knot (
Geom::Point & p,
// TODO: check if knot_click being ignored is bad:
- PointParamKnotHolderClickedFunc knot_click,
+ PointParamKnotHolderClickedFunc /*knot_click*/,
SPKnotShapeType shape,
SPKnotModeType mode,
guint32 color,
index 5c94f1e1b4cc255cc9f331bcba4eb89f14015b69..bd55bfb10d9f37d1296f7c33526464f94d73bfc2 100644 (file)
int const initial = bpd->moveto_idx;
int const current = bpd->n_bpath - 1;
NR::Point distToInit(distTo(bpd, current, initial));
+ // TODO check the double to int conversion in the abs() call:
return
distToInit[NR::X] <= abs(bpd->bpath[current].c(3)[NR::X])*precision &&
distToInit[NR::Y] <= abs(bpd->bpath[current].c(3)[NR::Y])*precision;
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index f62c584c3bf03236785a6786ecdb4df6bd19fb99..eb36d4c696d86e42a5a5d66365cd94d067caefe8 100644 (file)
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
}
}
-void imageMapCB(GtkWidget* widget, gpointer user_data) {
+void imageMapCB(GtkWidget* widget, gpointer /*user_data*/) {
gchar* id = 0;
GtkIconSize size = GTK_ICON_SIZE_INVALID;
gtk_image_get_stock(GTK_IMAGE(widget), &id, &size);