upstream/oracle/userland-gate: components/imagemagick/patches/test-exceptions.patch@f6ceda1a08d4 (annotated)

3798 c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	1	This patch was developed in-house to get 'gmake test' to compile. We have
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	2	not yet determined whether or not to pass it upstream.
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	3
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	4	--- ImageMagick-6.8.3/Magick++/demo/button.cpp.orig 2010-01-05 06:04:01.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	5	+++ ImageMagick-6.8.3/Magick++/demo/button.cpp 2015-02-11 07:03:58.267285998 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	6	@@ -90,7 +90,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	7	// button.display();
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	8
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	9	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	10	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	11	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	12	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	13	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	14	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	15	--- ImageMagick-6.8.3/Magick++/demo/demo.cpp.orig 2010-05-29 18:16:06.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	16	+++ ImageMagick-6.8.3/Magick++/demo/demo.cpp 2015-02-11 07:05:43.515927192 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	17	@@ -510,7 +510,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	18	// montage_image.display();
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	19
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	20	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	21	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	22	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	23	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	24	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	25	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	26	--- ImageMagick-6.8.3/Magick++/demo/flip.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	27	+++ ImageMagick-6.8.3/Magick++/demo/flip.cpp 2015-02-11 07:06:56.484455695 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	28	@@ -50,7 +50,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	29	writeImages( morphed.begin(), morphed.end(), "flip_out.miff" );
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	30
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	31	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	32	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	33	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	34	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	35	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	36	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	37	--- ImageMagick-6.8.3/Magick++/demo/gravity.cpp.orig 2010-05-27 13:51:26.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	38	+++ ImageMagick-6.8.3/Magick++/demo/gravity.cpp 2015-02-11 07:08:01.108746080 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	39	@@ -73,7 +73,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	40	// system( "animate gravity_out.miff" );
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	41
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	42	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	43	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	44	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	45	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	46	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	47	return 1;
6020 83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	48	--- ImageMagick-6.9.4/Magick++/demo/piddle.cpp.~1~ 2016-05-09 10:28:57.000000000 -0700
83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	49	+++ ImageMagick-6.9.4/Magick++/demo/piddle.cpp 2016-05-10 09:08:10.587311299 -0700
83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	50	@@ -170,7 +170,7 @@
3798 c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	51	// image.display( );
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	52
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	53	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	54	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	55	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	56	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	57	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	58	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	59	--- ImageMagick-6.8.3/Magick++/demo/shapes.cpp.orig 2011-02-02 18:08:56.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	60	+++ ImageMagick-6.8.3/Magick++/demo/shapes.cpp 2015-02-11 07:10:26.414505806 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	61	@@ -109,7 +109,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	62	// image.display( );
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	63
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	64	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	65	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	66	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	67	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	68	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	69	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	70	--- ImageMagick-6.8.3/Magick++/demo/zoom.cpp.orig 2010-05-29 18:16:06.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	71	+++ ImageMagick-6.8.3/Magick++/demo/zoom.cpp 2015-02-11 07:12:38.302672267 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	72	@@ -63,7 +63,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	73	try {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	74	density=Geometry(argv[argv_index]);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	75	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	76	- catch( exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	77	+ catch( Exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	78	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	79	ParseError(argv_index,argv);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	80	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	81	@@ -119,7 +119,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	82	try {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	83	geometry=Geometry(argv[argv_index]);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	84	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	85	- catch( exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	86	+ catch( Exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	87	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	88	ParseError(argv_index,argv);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	89	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	90	@@ -132,7 +132,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	91	try {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	92	resample=Geometry(argv[argv_index]);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	93	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	94	- catch( exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	95	+ catch( Exception &/* error_ */)
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	96	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	97	ParseError(argv_index,argv);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	98	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	99	@@ -180,7 +180,7 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	100	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	101	image.write(output_file);
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	102	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	103	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	104	+ catch( Exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	105	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	106	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	107	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	108	--- ImageMagick-6.8.3/Magick++/tests/appendImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	109	+++ ImageMagick-6.8.3/Magick++/tests/appendImages.cpp 2015-02-11 07:16:52.216679885 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	110	@@ -76,11 +76,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	111	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	112	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	113	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	114	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	115	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	116	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	117	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	118	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	119
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	120	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	121	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	122	--- ImageMagick-6.8.3/Magick++/tests/attributes.cpp.orig 2012-06-18 10:27:31.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	123	+++ ImageMagick-6.8.3/Magick++/tests/attributes.cpp 2015-02-11 07:19:39.714613173 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	124	@@ -1501,11 +1501,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	125	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	126	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	127	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	128	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	129	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	130	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	131	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	132	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	133
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	134	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	135	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	136	--- ImageMagick-6.8.3/Magick++/tests/averageImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	137	+++ ImageMagick-6.8.3/Magick++/tests/averageImages.cpp 2015-02-11 07:20:22.914703162 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	138	@@ -58,11 +58,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	139	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	140	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	141	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	142	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	143	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	144	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	145	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	146	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	147
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	148	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	149	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	150	--- ImageMagick-6.8.3/Magick++/tests/coalesceImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	151	+++ ImageMagick-6.8.3/Magick++/tests/coalesceImages.cpp 2015-02-11 07:21:36.319285353 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	152	@@ -45,11 +45,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	153	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	154	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	155	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	156	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	157	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	158	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	159	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	160	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	161
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	162	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	163	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	164	--- ImageMagick-6.8.3/Magick++/tests/coderInfo.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	165	+++ ImageMagick-6.8.3/Magick++/tests/coderInfo.cpp 2015-02-11 07:22:07.803975862 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	166	@@ -118,11 +118,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	167	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	168	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	169	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	170	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	171	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	172	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	173	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	174	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	175
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	176	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	177	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	178	--- ImageMagick-6.8.3/Magick++/tests/color.cpp.orig 2010-09-19 08:13:42.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	179	+++ ImageMagick-6.8.3/Magick++/tests/color.cpp 2015-02-11 07:25:37.141826377 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	180	@@ -138,11 +138,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	181	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	182	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	183	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	184	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	185	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	186	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	187	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	188	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	189
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	190	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	191	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	192	--- ImageMagick-6.8.3/Magick++/tests/colorHistogram.cpp.orig 2010-05-27 13:51:26.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	193	+++ ImageMagick-6.8.3/Magick++/tests/colorHistogram.cpp 2015-02-11 07:26:23.437002967 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	194	@@ -84,11 +84,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	195	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	196	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	197	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	198	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	199	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	200	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	201	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	202	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	203
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	204	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	205	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	206	--- ImageMagick-6.8.3/Magick++/tests/exceptions.cpp.orig 2011-12-31 09:22:05.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	207	+++ ImageMagick-6.8.3/Magick++/tests/exceptions.cpp 2015-02-11 07:26:55.141360186 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	208	@@ -82,12 +82,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	209	cout.flush();
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	210	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	211	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	212	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	213	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	214	- cout << "Bogus catch: Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	215	- cout.flush();
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	216	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	217	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	218
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	219	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	220	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	221	--- ImageMagick-6.8.3/Magick++/tests/montageImages.cpp.orig 2011-02-02 17:31:01.000000000 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	222	+++ ImageMagick-6.8.3/Magick++/tests/montageImages.cpp 2015-02-11 07:29:32.433719660 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	223	@@ -123,11 +123,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	224	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	225	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	226	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	227	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	228	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	229	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	230	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	231	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	232
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	233	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	234	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	235	--- ImageMagick-6.8.3/Magick++/tests/morphImages.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	236	+++ ImageMagick-6.8.3/Magick++/tests/morphImages.cpp 2015-02-11 07:30:08.668795257 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	237	@@ -54,11 +54,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	238	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	239	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	240	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	241	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	242	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	243	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	244	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	245	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	246
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	247	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	248	{
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	249	--- ImageMagick-6.8.3/Magick++/tests/readWriteBlob.cpp.orig 2009-09-05 14:47:34.000000000 -0700
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	250	+++ ImageMagick-6.8.3/Magick++/tests/readWriteBlob.cpp 2015-02-11 07:33:35.032546179 -0800
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	251	@@ -237,11 +237,6 @@
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	252	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	253	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	254	}
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	255	- catch( exception &error_ )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	256	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	257	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	258	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	259	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	260
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	261	if ( failures )
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	262	{
6020 83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	263	--- ImageMagick-6.9.4/Magick++/tests/readWriteImages.cpp.~1~ 2016-05-10 09:05:23.297878177 -0700
83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	264	+++ ImageMagick-6.9.4/Magick++/tests/readWriteImages.cpp 2016-05-10 09:06:14.986053932 -0700
83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	265	@@ -162,11 +162,6 @@
3798 c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	266	cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	267	return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	268	}
6020 83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	269	- catch(exception &error_)
3798 c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	270	- {
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	271	- cout << "Caught exception: " << error_.what() << endl;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	272	- return 1;
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	273	- }
c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	274
6020 83b3789e8d88 23278701 Upgrade ImageMagick to 6.9.4 John Beck <John.Beck@Oracle.COM> parents: 3798 diff changeset	275	if (failures)
3798 c0f7a9f723ca 20192735 ImageMagick should gets its tests to run, with master results John Beck <John.Beck@Oracle.COM> parents: diff changeset	276	{

author	John Beck <John.Beck@Oracle.COM>
	Fri, 29 Jul 2016 06:17:40 -0700
changeset 6517	f6ceda1a08d4
parent 6020	83b3789e8d88
permissions	-rw-r--r--