[gentoo-commits] gentoo-x86 commit in media-sound/gejengel/files: gejengel-0.1.2_64bit_fix.patch

[gentoo-commits] gentoo-x86 commit in media-sound/gejengel/files: gejengel-0.1.2_64bit_fix.patch

[Markos Chandras (hwoarang)]

hwoarang    10/01/15 17:15:35

  Added:                gejengel-0.1.2_64bit_fix.patch
  Log:
  Version bump. Fixes bug #299349 as well
  (Portage version: 2.2_rc61/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-sound/gejengel/files/gejengel-0.1.2_64bit_fix.patch?rev=1.1&content-type=text/plain

Index: gejengel-0.1.2_64bit_fix.patch
===================================================================
Index: src/ui/trackview.cpp
===================================================================
--- src/ui/trackview.cpp	(revision 409)
+++ src/ui/trackview.cpp	(revision 410)
@@ -148,17 +148,17 @@
         }
         
         Gtk::TreeViewColumn* pCol = m_TreeView.get_column(i);
-        ss << reinterpret_cast<int>(pCol->property_user_data().get_value());
+        ss << reinterpret_cast<int64_t>(pCol->property_user_data().get_value());
     }
     
     m_Settings.set("TrackViewColumns", ss.str());
     
-    int sortId;
+    int32_t sortId;
     Gtk::SortType sortOrder;
     m_TrackModel.getSortColumn(sortId, sortOrder);
     
     m_Settings.set("TrackViewSortColumnId", sortId);
-    m_Settings.set("TrackViewSortColumnOrder", static_cast<int>(sortOrder));
+    m_Settings.set("TrackViewSortColumnOrder", static_cast<int32_t>(sortOrder));
 }
 
 bool TrackView::onButtonPress(GdkEventButton* pEvent)
@@ -280,8 +280,8 @@
     std::vector<Gtk::TreeViewColumn*> columns = m_TreeView.get_columns();
     for (size_t i = 0; i < columns.size(); ++i)
     {
-        int32_t id = reinterpret_cast<int32_t>(m_TreeView.get_column(i)->property_user_data().get_value());
-        if (id == headerId)
+        int64_t id = reinterpret_cast<int64_t>(m_TreeView.get_column(i)->property_user_data().get_value());
+        if (static_cast<int32_t>(id) == headerId)
         {
             pColToRemove = m_TreeView.get_column(i);
             break;