Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
6a3cb9f9
Kaydet (Commit)
6a3cb9f9
authored
Tem 25, 2011
tarafından
Fridrich Štrba
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Not everybody has stdint.h when one needs it
üst
050f3bb1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
92 additions
and
1 deletion
+92
-1
libvisio-0.0.3-uint8_t.patch
libvisio/libvisio-0.0.3-uint8_t.patch
+90
-0
makefile.mk
libvisio/makefile.mk
+2
-1
No files found.
libvisio/libvisio-0.0.3-uint8_t.patch
0 → 100644
Dosyayı görüntüle @
6a3cb9f9
--- misc/libvisio-0.0.3/src/lib/VSDXCollector.h 2011-07-22 14:35:49.000000000 +0200
+++ misc/build/libvisio-0.0.3/src/lib/VSDXCollector.h 2011-07-25 12:18:22.334328001 +0200
@@ -22,7 +22,6 @@
#define VSDXCOLLECTOR_H
#include <vector>
-#include <stdint.h>
#include "VSDXParser.h"
namespace libvisio {
@@ -63,7 +62,7 @@
virtual void collectColours(const std::vector<Colour> &colours) = 0;
virtual void collectCharList(unsigned id, unsigned level) = 0;
- virtual void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format) = 0;
+ virtual void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format) = 0;
virtual void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace) = 0;
// Temporary hack
--- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp 2011-07-22 14:35:49.000000000 +0200
+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.cpp 2011-07-25 12:18:30.722328001 +0200
@@ -987,7 +987,7 @@
m_colours.push_back(colours[i]);
}
-void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format)
+void libvisio::VSDXContentCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format)
{
_handleLevelChange(level);
@@ -1156,7 +1156,7 @@
if (fail)
throw GenericException();
- uint8_t first;
+ unsigned char first;
int len;
if (ucs4Character < 0x80)
{
@@ -1189,7 +1189,7 @@
len = 6;
}
- uint8_t outbuf[6] = { 0, 0, 0, 0, 0, 0};
+ unsigned char outbuf[6] = { 0, 0, 0, 0, 0, 0};
int i;
for (i = len - 1; i > 0; --i)
{
--- misc/libvisio-0.0.3/src/lib/VSDXContentCollector.h 2011-07-22 14:35:49.000000000 +0200
+++ misc/build/libvisio-0.0.3/src/lib/VSDXContentCollector.h 2011-07-25 12:18:13.810328000 +0200
@@ -77,7 +77,7 @@
void collectColours(const std::vector<Colour> &colours);
void collectCharList(unsigned id, unsigned level);
- void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
+ void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
void startPage();
@@ -148,7 +148,7 @@
std::map<unsigned, NURBSData> m_NURBSData;
std::map<unsigned, PolylineData> m_polylineData;
- std::vector<uint8_t> m_textStream;
+ std::vector<unsigned char> m_textStream;
TextFormat m_textFormat;
bool m_outputTextStart;
};
--- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp 2011-07-22 14:35:49.000000000 +0200
+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.cpp 2011-07-25 12:18:26.586328031 +0200
@@ -180,7 +180,7 @@
{
}
-void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<uint8_t> & /*textStream*/, TextFormat /*format*/)
+void libvisio::VSDXStylesCollector::collectText(unsigned /*id*/, unsigned level, const std::vector<unsigned char> & /*textStream*/, TextFormat /*format*/)
{
_handleLevelChange(level);
}
--- misc/libvisio-0.0.3/src/lib/VSDXStylesCollector.h 2011-07-22 14:35:49.000000000 +0200
+++ misc/build/libvisio-0.0.3/src/lib/VSDXStylesCollector.h 2011-07-25 12:18:06.970328002 +0200
@@ -68,7 +68,7 @@
void collectColours(const std::vector<Colour> &colours);
void collectCharList(unsigned id, unsigned level);
- void collectText(unsigned id, unsigned level, const std::vector<uint8_t> &textStream, TextFormat format);
+ void collectText(unsigned id, unsigned level, const std::vector<unsigned char> &textStream, TextFormat format);
void collectCharFormat(unsigned id , unsigned level, unsigned charCount, unsigned langId, double fontSize, bool bold, bool italic, bool underline, WPXString fontFace);
// Temporary hack
void startPage();
libvisio/makefile.mk
Dosyayı görüntüle @
6a3cb9f9
...
...
@@ -58,7 +58,8 @@ TARFILE_NAME=libvisio-0.0.3
TARFILE_MD5
=
90882496f9ff4cd6d75d61dac2f62f66
PATCH_FILES
=
\
libvisio-0.0.3.patch
libvisio-0.0.3.patch
\
libvisio-0.0.3-uint8_t.patch
BUILD_ACTION
=
dmake
$(MFLAGS)
$(CALLMACROS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment