Attachment #174930 for bug #240614

View | Details | Raw Unified | Return to bug 240614
Collapse All | Expand All

Lines 1-5 Link Here

(-)mms-1.0.8.5/config_header.hpp.orig (+1 lines)
1	#include <string>	1	#include <string>
2	#include <list>	2	#include <list>
		3	#include <cstdlib>
3		4
4	#include "print.hpp"	5	#include "print.hpp"
5		6

Lines 3-8 Link Here

(-)mms-1.0.8.5/config_maker.hpp.orig (+1 lines)
3	#include <fstream>	3	#include <fstream>
4	#include <iostream>	4	#include <iostream>
5	#include <sstream>	5	#include <sstream>
		6	#include <cstdlib>
6		7
7	#include "gettext.hpp"	8	#include "gettext.hpp"
8		9

Lines 13-18 Link Here

(-)mms-1.0.8.5/input.cpp.orig (+1 lines)
13	#include <fstream>	13	#include <fstream>
14	#include <sstream>	14	#include <sstream>
15	#include <iostream>	15	#include <iostream>
		16	#include <cstdlib>
16		17
17	using std::string;	18	using std::string;
18		19




}

void Render::text_part(const string& message, const string& font_name, int r, int g, int b, 
		       int x, int y, int total_w, int total_h, const rect& rct)
{
  if (set_font(font_name)) {
    Imlib_Image temp2= imlib_create_cropped_image(rct.x, rct.y, rct.w, rct.h);

    Imlib_Image temp = imlib_create_image(total_w, total_h);
    
    imlib_context_set_image(temp);

    imlib_blend_image_onto_image(temp2, 0, 0, 0, rct.w, rct.h, rct.x-x, rct.y-y, rct.w, rct.h);

    imlib_context_set_image(temp2);
    imlib_free_image();


    imlib_context_set_image(current.image_data);

    imlib_blend_image_onto_image(temp, 0, rct.x-x, rct.y-y, rct.w, rct.h, rct.x, rct.y, rct.w, rct.h);

    imlib_context_set_image(temp);
    imlib_free_image();

Lines 182-188 Link Here

(-)mms-1.0.8.5/renderer.hpp.orig (-1 / +1 lines)
182		182
183	void text(const std::string& text, const std::string& font, int x, int y, int r, int g, int b);	183	void text(const std::string& text, const std::string& font, int x, int y, int r, int g, int b);
184	void text_part(const std::string& text, const std::string& font, int r, int g, int b,	184	void text_part(const std::string& text, const std::string& font, int r, int g, int b,
185	int x, int y, int total_w, int total_h, const rect& r);	185	int x, int y, int total_w, int total_h, const rect& rct);
186	void rectangle(int x, int y, int width, int height, int r, int g, int b, int a);	186	void rectangle(int x, int y, int width, int height, int r, int g, int b, int a);
187	};	187	};
188		188

Lines 7-12 Link Here

(-)mms-1.0.8.5/general.cc.orig (+1 lines)
7	#include <sys/stat.h>	7	#include <sys/stat.h>
8	#include <unistd.h>	8	#include <unistd.h>
9	#include <sstream>	9	#include <sstream>
		10	#include <cstdlib>
10		11
11	#include <map>	12	#include <map>
12	#include <string>	13	#include <string>

Lines 3-8 Link Here

(-)mms-1.0.8.5/library-builder/md5digest.h.orig (+1 lines)
3		3
4	#include <string>	4	#include <string>
5	#include <stdio.h>	5	#include <stdio.h>
		6	#include <cstring>
6	#include "md5.h"	7	#include "md5.h"
7		8
8	using std::string;	9	using std::string;

Lines 1-5 Link Here

(-)mms-1.0.8.5/library-builder/picker.cc.orig (+1 lines)
1	#include <iostream>	1	#include <iostream>
2	#include <algorithm>	2	#include <algorithm>
		3	#include <climits>
3		4
4	#include <math.h>	5	#include <math.h>
5		6

Lines 1-5 Link Here

(-)mms-1.0.8.5/library-builder/sqldb.cc.orig (+1 lines)
1	#include <iostream>	1	#include <iostream>
2	#include <sstream>	2	#include <sstream>
		3	#include <cstring>
3	#include <sqlite.h>	4	#include <sqlite.h>
4		5
5	#include "strmanip.h"	6	#include "strmanip.h"

Lines 1-5 Link Here

(-)mms-1.0.8.5/library-builder/spectrum.cc.orig (+3 lines)
1	#include <math.h>	1	#include <math.h>
2	#include <assert.h>	2	#include <assert.h>
		3	#include <climits>
		4	#include <cstring>
		5	#include <cstdlib>
3		6
4	#include <iostream>	7	#include <iostream>
5	#include <utility>	8	#include <utility>

Lines 2-7 Link Here

(-)mms-1.0.8.5/imdb.cpp.orig (+2 lines)
2	// converted from Winblows to UNIX by Anders Rune Jensen	2	// converted from Winblows to UNIX by Anders Rune Jensen
3	// changed to use http_fetcher library instead of buggy and ugly http class	3	// changed to use http_fetcher library instead of buggy and ugly http class
4		4
		5	#include <cstdlib>
		6
5	#include "imdb.hpp"	7	#include "imdb.hpp"
6		8
7	#include "print.hpp"	9	#include "print.hpp"

Lines 25-30 Link Here

(-)mms-1.0.8.5/libs/libavcodec/i386/mpegvideo_mmx.c.orig (-2 / +13 lines)
25	#include "../avcodec.h"	25	#include "../avcodec.h"
26	#include "mmx.h"	26	#include "mmx.h"
27		27
		28	/* x86_cpu.h from ffmpeg */
		29
		30	#include <stdint.h>
		31
		32	#ifdef ARCH_X86_64
		33	typedef int64_t x86_reg;
		34	#elif ARCH_X86_32
		35	typedef int32_t x86_reg;
		36	#endif
		37
		38
28	extern uint8_t zigzag_direct_noperm[64];	39	extern uint8_t zigzag_direct_noperm[64];
29	extern uint16_t inv_zigzag_direct16[64];	40	extern uint16_t inv_zigzag_direct16[64];
30		41
Lines 35-41 Link Here
35	static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,	46	static void dct_unquantize_h263_intra_mmx(MpegEncContext *s,
36	DCTELEM *block, int n, int qscale)	47	DCTELEM *block, int n, int qscale)
37	{	48	{
38	long level, qmul, qadd, nCoeffs;	49	x86_reg level, qmul, qadd, nCoeffs;
39		50
40	qmul = qscale << 1;	51	qmul = qscale << 1;
41		52
Lines 100-106 Link Here
100		111
101	"add $16, %3 \n\t"	112	"add $16, %3 \n\t"
102	"jng 1b \n\t"	113	"jng 1b \n\t"
103	::"r" (block+nCoeffs), "g"(qmul), "g" (qadd), "r" (2*(-nCoeffs))	114	::"r" (block+nCoeffs), "rm"(qmul), "rm" (qadd), "r" (2*(-nCoeffs))
104	: "memory"	115	: "memory"
105	);	116	);
106	block[0]= level;	117	block[0]= level;

Return to bug 240614

Lines 1219-1234 Link Here

(-)mms-1.0.8.5/renderer.cpp.orig (-4 / +4 lines)
1219	}	1219	}
1220		1220
1221	void Render::text_part(const string& message, const string& font_name, int r, int g, int b,	1221	void Render::text_part(const string& message, const string& font_name, int r, int g, int b,
1222	int x, int y, int total_w, int total_h, const rect& rect)	1222	int x, int y, int total_w, int total_h, const rect& rct)
1223	{	1223	{
1224	if (set_font(font_name)) {	1224	if (set_font(font_name)) {
1225	Imlib_Image temp2= imlib_create_cropped_image(rect.x, rect.y, rect.w, rect.h);	1225	Imlib_Image temp2= imlib_create_cropped_image(rct.x, rct.y, rct.w, rct.h);
1226		1226
1227	Imlib_Image temp = imlib_create_image(total_w, total_h);	1227	Imlib_Image temp = imlib_create_image(total_w, total_h);
1228		1228
1229	imlib_context_set_image(temp);	1229	imlib_context_set_image(temp);
1230		1230
1231	imlib_blend_image_onto_image(temp2, 0, 0, 0, rect.w, rect.h, rect.x-x, rect.y-y, rect.w, rect.h);	1231	imlib_blend_image_onto_image(temp2, 0, 0, 0, rct.w, rct.h, rct.x-x, rct.y-y, rct.w, rct.h);
1232		1232
1233	imlib_context_set_image(temp2);	1233	imlib_context_set_image(temp2);
1234	imlib_free_image();	1234	imlib_free_image();
Lines 1251-1257 Link Here
1251		1251
1252	imlib_context_set_image(current.image_data);	1252	imlib_context_set_image(current.image_data);
1253		1253
1254	imlib_blend_image_onto_image(temp, 0, rect.x-x, rect.y-y, rect.w, rect.h, rect.x, rect.y, rect.w, rect.h);	1254	imlib_blend_image_onto_image(temp, 0, rct.x-x, rct.y-y, rct.w, rct.h, rct.x, rct.y, rct.w, rct.h);
1255		1255
1256	imlib_context_set_image(temp);	1256	imlib_context_set_image(temp);
1257	imlib_free_image();	1257	imlib_free_image();