| 5d6fa0ca | 2014-08-27 08:41:02 | Michele Calgaro |
Fixed warning messages when starting Chalk. This resolves bug 1976. |
||
|
M chalk/plugins/tools/defaulttools/kis_tool_brush.cc M chalk/ui/kis_view.cc |
||
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 8641358..7c83a36 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -154,7 +154,7 @@
m_chkDirect->setChecked(true);
connect(m_chkDirect, TQT_SIGNAL(stateChanged(int)), this, TQT_SLOT(slotSetPaintingMode(int)));
- m_optionLayout = new TQGridLayout(widget, 3, 2, 0, 6);
+ m_optionLayout = new TQGridLayout(NULL, 3, 2, 0, 6);
TQ_CHECK_PTR(m_optionLayout);
super::addOptionWidgetLayout(m_optionLayout);
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index 7957535..569188d 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -945,7 +945,7 @@
TQPainter gc;
- if (gc.begin(&m_canvasPixmap)) {
+ if (!m_canvasPixmap.isNull() && gc.begin(&m_canvasPixmap)) {
KisImageSP img = currentImg();
|
||
| fa6cb595 | 2014-08-27 08:41:17 | Michele Calgaro |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/koffice |
||
|
M chalk/core/kis_exif_value.cc |
||
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 1981bd0..134d400 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cc
@@ -667,8 +667,11 @@
return TQString("%1 ").arg( asExifNumber( i ).m_long );
case EXIF_TYPE_RATIONAL:
return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
- case EXIF_TYPE_SBYTE:
- return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
+ case EXIF_TYPE_SBYTE: {
+ /* workaround to compiler bug on Raspbian Wheezy */
+ TQ_INT8 o_sbyte = asExifNumber( i ).m_sbyte;
+ return TQString("%1 ").arg( o_sbyte );
+ }
case EXIF_TYPE_SSHORT:
return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
case EXIF_TYPE_SLONG:
|
||