Hello community,
here is the log from the commit of package sfftobmp for openSUSE:Factory
checked in at Tue Mar 22 17:20:23 CET 2011.
--------
--- sfftobmp/sfftobmp.changes 2011-03-21 13:19:38.000000000 +0100
+++ /mounts/work_src_done/STABLE/sfftobmp/sfftobmp.changes 2011-03-21
19:43:58.000000000 +0100
@@ -1,0 +2,6 @@
+Mon Mar 21 19:42:01 CET 2011 - p...@suse.de
+
+- Fix class member initialisation to quite the compiler.
+- Cast vars to the type matching the printf format.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
sfftobmp-codecleanup.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sfftobmp.spec ++++++
--- /var/tmp/diff_new_pack.Hm4PVr/_old 2011-03-22 17:19:53.000000000 +0100
+++ /var/tmp/diff_new_pack.Hm4PVr/_new 2011-03-22 17:19:53.000000000 +0100
@@ -20,16 +20,18 @@
Name: sfftobmp
BuildRequires: boost-devel gcc-c++ libjpeg-devel libtiff-devel
+BuildRequires: unix2dos
License: MIT
Group: Hardware/ISDN
AutoReqProv: on
Version: 3.1.1
-Release: 111
+Release: 112
Summary: Tool to convert Structured Fax Files (.sff) to other image
formats
Source: %{name}-%{version}.tar.bz2
Url: http://sfftools.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch: %{name}-gcc43.diff
+Patch1: sfftobmp-codecleanup.diff
%description
The CAPI interface for programming ISDN hardware expects and gives
@@ -49,7 +51,9 @@
%prep
%setup -q -n %{name}%{version}
+dos2unix -c mac src/output.h
%patch
+%patch1
%build
#This will stop working with boost 1.48
++++++ sfftobmp-codecleanup.diff ++++++
Index: src/output.cpp
===================================================================
--- src/output.cpp.orig 2011-03-21 16:36:39.000000000 +0100
+++ src/output.cpp 2011-03-21 16:37:17.293874585 +0100
@@ -163,7 +163,7 @@ void CPBMFilter::BeginPage(sff_dword aPa
m_pFile->Write(acBuf, strlen(acBuf));
sprintf(acBuf, "%s", "# generated with SffToBmp\n");
m_pFile->Write(acBuf, strlen(acBuf));
- sprintf(acBuf, "%ld %ld\n", aWidth, aHeight);
+ sprintf(acBuf, "%u %u\n", (unsigned int)aWidth, (unsigned int)aHeight);
m_pFile->Write(acBuf, strlen(acBuf));
}
Index: src/output.h
===================================================================
--- src/output.h.orig 2011-03-21 16:37:14.482473442 +0100
+++ src/output.h 2011-03-21 16:37:17.294874728 +0100
@@ -87,9 +87,9 @@ protected:
public:
COutputFilter(const std::string& strExt, sff_word nPagecount) :
- m_strExtension(strExt),
+ m_sink(m_abBuffer, sizeof(m_abBuffer)),
m_nPageCount(nPagecount),
- m_sink(m_abBuffer, sizeof(m_abBuffer))
+ m_strExtension(strExt)
{ /* nth. else */ }
virtual void Init(CFile *pFile);
@@ -157,8 +157,8 @@ protected:
public:
CJPEGFilter(sff_word nPagecount, int nQuality = 40) :
COutputFilter(".jpg", nPagecount),
- m_quality(nQuality),
- m_bytesink(m_abBuffer, sizeof(m_abBuffer))
+ m_bytesink(m_abBuffer, sizeof(m_abBuffer)),
+ m_quality(nQuality)
{ /* nth. else */ };
CBitSink& GetBitSink();
@@ -185,8 +185,8 @@ protected:
public:
CTIFFFilter(sff_word nPagecount, sff_word nCompression, time_t nModTime) :
COutputFilter(".tif", nPagecount),
- m_wCompression(nCompression),
m_tiffFile(NULL),
+ m_wCompression(nCompression),
m_nModTime(nModTime)
{ /* nth. else */ };
Index: src/cmdline.cpp
===================================================================
--- src/cmdline.cpp.orig 2011-03-21 16:36:39.000000000 +0100
+++ src/cmdline.cpp 2011-03-21 16:37:17.322878722 +0100
@@ -140,7 +140,7 @@ void CCmdLineProcessor::printVersion()
void CCmdLineProcessor::parseCmdLine()
{
// short options string (one colon: req arg, two colon: opt arg)
- char *shortopts = "vhbpT::t::frdj::o:q";
+ const char * const shortopts = "vhbpT::t::frdj::o:q";
// long options list
struct option longopts[] =
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
