[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2006-03-02 8:34:13
Message-ID: 1141288453.411894.27391.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 514976 by rempt:

* Fix undo of layertype change
* Fix crash when converting a singe layer's colorspace
* Less debug


 M  +1 -1      krita/core/kis_group_layer.cc  
 M  +1 -1      krita/core/kis_image.cc  
 M  +2 -1      krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc  
 M  +1 -1      lib/kopalette/kopalette.cc  


--- trunk/koffice/krita/core/kis_group_layer.cc #514975:514976
@@ -89,7 +89,7 @@
     kdDebug(41010) << "Abusing our only child? Parent: " << parent() << ", children: " << childCount() \
<< endl;  if (parent() == 0 && childCount() == 1) {
         KisPaintLayerSP l = dynamic_cast<KisPaintLayer*>(firstChild().data());
-        if (l && l->visible() && l->opacity() == OPACITY_OPAQUE) {
+        if (l && l->paintDevice()->colorSpace() == m_image->colorSpace() && l->visible() && l->opacity() \
== OPACITY_OPAQUE) {  l->setClean(rect);
             setClean(rect);
             return l->paintDevice();
--- trunk/koffice/krita/core/kis_image.cc #514975:514976
@@ -1377,11 +1377,11 @@
     srcRect.setBottom(static_cast<int>(ceil((r.bottom() + 1) * yScale)) - 1);
 
     KisPaintDeviceSP mergedImage = m_rootLayer->projection(srcRect);
-
     //QTime t;
     //t.start();
 
     Q_UINT8 *scaledImageData = new Q_UINT8[r.width() * r.height() * pixelSize];
+    
     Q_UINT8 *imageRow = new Q_UINT8[srcRect.width() * pixelSize];
     const Q_INT32 imageRowX = srcRect.x();
 
--- trunk/koffice/krita/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc #514975:514976
@@ -149,7 +149,8 @@
 
     if (dlgColorSpaceConversion -> exec() == QDialog::Accepted) {
         KisID cspace = dlgColorSpaceConversion -> m_page -> cmbColorSpaces -> currentItem();
-        KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry() -> getColorSpace(cspace, \
dlgColorSpaceConversion -> m_page -> cmbDestProfile -> currentText()); +        KisColorSpace * cs = \
KisMetaRegistry::instance()->csRegistry() -> +                getColorSpace(cspace, \
dlgColorSpaceConversion -> m_page -> cmbDestProfile -> currentText());  
         QApplication::setOverrideCursor(KisCursor::waitCursor());
         dev -> convertTo(cs, dlgColorSpaceConversion -> m_page -> grpIntent -> selectedId());
--- trunk/koffice/lib/kopalette/kopalette.cc #514975:514976
@@ -69,7 +69,7 @@
     m_font  = KGlobalSettings::generalFont();
     float ps = m_font.pointSize() * 0.7;
     ps = cfg->readNumEntry("palettefontsize", (int)ps);
-    kdDebug() << "going to set fontsize " << ps << "\n";
+    if (ps < 6) ps = 6;
     m_font.setPointSize((int)ps);
     setFont(m_font);
 


[prev in list] [next in list] [prev in thread] [next in thread]