Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bugzilla DB migration completed. Please report issues to Infra team via email via infra@gentoo.org or IRC
View | Details | Raw Unified | Return to bug 595010 | Differences between
and this patch

Collapse All | Expand All

(-)a/cuneiform_src/Kern/rout/src/codetables.cpp (-5 / +5 lines)
Lines 939-949 Link Here
939
939
940
const char * getUTF8Str(const unsigned char in, const int codepage) {
940
const char * getUTF8Str(const unsigned char in, const int codepage) {
941
  switch(codepage) {
941
  switch(codepage) {
942
  case 1250 : return win1250_to_utf8[in];
942
  case 1250 : return (const char*)win1250_to_utf8[in];
943
  case 1251 : return win1251_to_utf8[in];
943
  case 1251 : return (const char*)win1251_to_utf8[in];
944
  case 1252 : return win1252_to_utf8[in];
944
  case 1252 : return (const char*)win1252_to_utf8[in];
945
  case 1254 : return win1254_to_utf8[in];
945
  case 1254 : return (const char*)win1254_to_utf8[in];
946
  case 1257 : return win1257_to_utf8[in];
946
  case 1257 : return (const char*)win1257_to_utf8[in];
947
  default : return "?";
947
  default : return "?";
948
  }
948
  }
949
}
949
}
(-)a/cuneiform_src/Kern/rimage/sources/main/cricontrol.cpp (-2 / +2 lines)
Lines 594-601 Link Here
594
		return FALSE;
594
		return FALSE;
595
	}
595
	}
596
596
597
	wNewHeight = (mbMarginsFlag ? abs(mrMargins.rmBottomMarg - mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
597
	wNewHeight = (mbMarginsFlag ? abs((int32_t)mrMargins.rmBottomMarg - (int32_t)mrMargins.rmTopMarg) : mpSourceDIB->GetLinesNumber());
598
	wNewWidth = (mbMarginsFlag ? abs(mrMargins.rmLeftMarg - mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
598
	wNewWidth = (mbMarginsFlag ? abs((int32_t)mrMargins.rmLeftMarg - (int32_t)mrMargins.rmRightMarg) : mpSourceDIB->GetLineWidth());
599
	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
599
	mpSourceDIB->GetResolutionDPM( &wXResolution, &wYResolution);
600
600
601
	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )
601
	if ( !mpDestinationDIB->CreateDIBBegin( wNewWidth, wNewHeight, BitCount) )
(-)a/cuneiform_src/Kern/rfrmt/sources/main/stdafx.h (-1 / +2 lines)
Lines 66-71 Link Here
66
#pragma once
66
#pragma once
67
#endif // _MSC_VER >= 1000
67
#endif // _MSC_VER >= 1000
68
68
69
#include <vector>
70
69
#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
71
#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
70
/*#include <windows.h>*/
72
/*#include <windows.h>*/
71
#include <stdio.h>
73
#include <stdio.h>
Lines 74-80 Link Here
74
//отключаем warning о слишком длинных stl'ных именах
76
//отключаем warning о слишком длинных stl'ных именах
75
#pragma warning(disable:4786)
77
#pragma warning(disable:4786)
76
78
77
#include <vector>
78
typedef std::vector<uint16_t> vectorWord;
79
typedef std::vector<uint16_t> vectorWord;
79
80
80
#include <assert.h>
81
#include <assert.h>
(-)a/cuneiform_src/Kern/rfrmt/sources/main/frmt.cpp (+2 lines)
Lines 72-77 Link Here
72
#endif
72
#endif
73
#include <stdlib.h>
73
#include <stdlib.h>
74
#include <stdio.h>
74
#include <stdio.h>
75
#undef min
76
#undef max
75
#include "stdafx.h"
77
#include "stdafx.h"
76
#include "resource.h"
78
#include "resource.h"
77
#include "rfrmt.h"
79
#include "rfrmt.h"
(-)a/cuneiform_src/Kern/include/utf8-tables.h (-5 / +5 lines)
Lines 68-74 Link Here
68
#endif
68
#endif
69
69
70
70
71
const char win1250_to_utf8[][4] = {
71
const unsigned char win1250_to_utf8[][4] = {
72
  {0, 0, 0, 0},
72
  {0, 0, 0, 0},
73
  {1, 0, 0, 0},
73
  {1, 0, 0, 0},
74
  {2, 0, 0, 0},
74
  {2, 0, 0, 0},
Lines 328-334 Link Here
328
};
328
};
329
329
330
330
331
const char win1251_to_utf8[][4] = {
331
const unsigned char win1251_to_utf8[][4] = {
332
  {0, 0, 0, 0},
332
  {0, 0, 0, 0},
333
  {1, 0, 0, 0},
333
  {1, 0, 0, 0},
334
  {2, 0, 0, 0},
334
  {2, 0, 0, 0},
Lines 587-593 Link Here
587
  {209, 143, 0, 0},
587
  {209, 143, 0, 0},
588
};
588
};
589
589
590
const char win1252_to_utf8[][4] = {
590
const unsigned char win1252_to_utf8[][4] = {
591
  {0, 0, 0, 0},
591
  {0, 0, 0, 0},
592
  {1, 0, 0, 0},
592
  {1, 0, 0, 0},
593
  {2, 0, 0, 0},
593
  {2, 0, 0, 0},
Lines 847-853 Link Here
847
};
847
};
848
848
849
849
850
const char win1254_to_utf8[][4] = {
850
const unsigned char win1254_to_utf8[][4] = {
851
  {0, 0, 0, 0},
851
  {0, 0, 0, 0},
852
  {1, 0, 0, 0},
852
  {1, 0, 0, 0},
853
  {2, 0, 0, 0},
853
  {2, 0, 0, 0},
Lines 1107-1113 Link Here
1107
};
1107
};
1108
1108
1109
1109
1110
const char win1257_to_utf8[][4] = {
1110
const unsigned char win1257_to_utf8[][4] = {
1111
  {0, 0, 0, 0},
1111
  {0, 0, 0, 0},
1112
  {1, 0, 0, 0},
1112
  {1, 0, 0, 0},
1113
  {2, 0, 0, 0},
1113
  {2, 0, 0, 0},

Return to bug 595010