v2.5.4.1 (same as 2.5.4 + ply loading bug fix)

Author: dgirardeau

ccViewer/ccviewer.cpp

@@ -55,7 +55,9 @@
 #include <assert.h>
 
 //! Current version
-const double CC_VIEWER_VERSION = 1.31;
+//const double CC_VIEWER_VERSION = 1.31;
+//const QString CC_VIEWER_VERSION_STR = QString::number(CC_VIEWER_VERSION,'f',2);
+const QString CC_VIEWER_VERSION_STR = "1.30.1"; //Special version (1.30 + ply file bug fix)
 
 //Camera parameters dialog
 ccCameraParamEditDlg* s_cpeDlg = 0;
@@ -68,7 +70,7 @@ ccViewer::ccViewer(QWidget *parent, Qt::WindowFlags flags)
 {
 	ui.setupUi(this);
 
-	setWindowTitle(QString("ccViewer V%1").arg(CC_VIEWER_VERSION,0,'f',2));
+	setWindowTitle(QString("ccViewer V%1").arg(CC_VIEWER_VERSION_STR));
 
 	//insert GL window in a vertical layout
 	QVBoxLayout* verticalLayout_2 = new QVBoxLayout(ui.GLframe);
@@ -857,7 +859,7 @@ void ccViewer::doActionAbout()
 
 	Ui::AboutDialog ui;
 	ui.setupUi(&aboutDialog);
-	ui.textEdit->setHtml(ui.textEdit->toHtml().arg(CC_VIEWER_VERSION,0,'f',2));
+	ui.textEdit->setHtml(ui.textEdit->toHtml().arg(CC_VIEWER_VERSION_STR));
 
 	aboutDialog.exec();
 }

qCC/bin_other/history.txt

@@ -1,8 +1,8 @@
 *** CloudCompare versions history ***
 
-v2.5.5 ??/??/2014
+v2.5.4.1 04/22/2014
 - Bug fix:
-	* Loading of PLY files with scalar field(s) would make CC crash
+	* Loading a PLY file with scalar field(s) would make CC crash
 
 v2.5.4 04/19/2014
 - New file format supported:

qCC/ccCommon.cpp

@@ -21,7 +21,7 @@
 #include "ccCommon.h"
 
 #define CC_VER_NUM "2.5"
-#define CC_SUB_VER "5.beta" //2014-04-20
+#define CC_SUB_VER "4.1" //2014-04-20
 
 //! Returns current version as a string
 QString ccCommon::GetCCVersion(bool full/*=true*/)