Attachment #145622 for bug #200767

Lines 25-30 Link Here

(-)mjpegtools-1.9.0rc3-orig/mpeg2enc/encodertypes.h (+2 lines)
25	*/	25	*/
26		26
27		27
		28	#include <stdlib.h>
		29
28	class Parity	30	class Parity
29	{	31	{
30	public:	32	public:

Lines 21-26 Link Here

(-)mjpegtools-1.9.0rc3-orig/mpeg2enc/macroblock.cc (+1 lines)
21		21
22	#include <stdio.h>	22	#include <stdio.h>
23	#include <cassert>	23	#include <cassert>
		24	#include <limits.h>
24		25
25	#include "macroblock.hh"	26	#include "macroblock.hh"
26	#include "mpeg2syntaxcodes.h"	27	#include "mpeg2syntaxcodes.h"

Lines 23-28 Link Here

(-)mjpegtools-1.9.0rc3-orig/mpeg2enc/picturereader.cc (+1 lines)
23	#include "picturereader.hh"	23	#include "picturereader.hh"
24	#include "mpeg2encoder.hh"	24	#include "mpeg2encoder.hh"
25	#include "imageplanes.hh"	25	#include "imageplanes.hh"
		26	#include <limits.h>
26	//#include <stdio.h>	27	//#include <stdio.h>
27	//#include <stdlib.h>	28	//#include <stdlib.h>
28	//#include <unistd.h>	29	//#include <unistd.h>

Lines 23-28 Link Here

(-)mjpegtools-1.9.0rc3-orig/mplex/inputstrm.cpp (+1 lines)
23		23
24	#include <config.h>	24	#include <config.h>
25	#include <assert.h>	25	#include <assert.h>
		26	#include <limits.h>
26		27
27	#include "mjpeg_types.h"	28	#include "mjpeg_types.h"
28	#include "inputstrm.hpp"	29	#include "inputstrm.hpp"

Lines 24-29 Link Here

(-)mjpegtools-1.9.0rc3-orig/mplex/padstrm.cpp (+1 lines)
24	#include "config.h"	24	#include "config.h"
25	#endif	25	#endif
26		26
		27	#include <string.h>
27	#include "padstrm.hpp"	28	#include "padstrm.hpp"
28		29
29		30

Lines 22-27 Link Here

(-)mjpegtools-1.9.0rc3-orig/mplex/multiplexor.cpp (+1 lines)
22	#include <config.h>	22	#include <config.h>
23	#include <math.h>	23	#include <math.h>
24	#include <stdlib.h>	24	#include <stdlib.h>
		25	#include <string.h>
25		26
26	#include <mjpeg_types.h>	27	#include <mjpeg_types.h>
27	#include <mjpeg_logging.h>	28	#include <mjpeg_logging.h>

Lines 31-36 Link Here

(-)mjpegtools-1.9.0rc3-orig/mplex/main.cpp (+1 lines)
31	#include <getopt.h>	31	#include <getopt.h>
32	#endif	32	#endif
33	#include <string>	33	#include <string>
		34	#include <string.h>
34	#include <memory>	35	#include <memory>
35	#include <sys/stat.h>	36	#include <sys/stat.h>
36	#ifndef _WIN32	37	#ifndef _WIN32

Lines 23-29 Link Here

(-)mjpegtools-1.9.0rc3-orig/y4mdenoise/Set.hh (-1 / +1 lines)
23	// How we implement ourselves.	23	// How we implement ourselves.
24		24
25	public:	25	public:
26	typedef typename Imp::Allocator Allocator;	26	typedef typename Imp::Allocator_t Allocator;
27	// The type of allocator to use to allocate items in the set.	27	// The type of allocator to use to allocate items in the set.
28		28
29	Set (const PRED &a_rPred = PRED(),	29	Set (const PRED &a_rPred = PRED(),




		// Will give good sorting for up to e^10 items.
	
public:
	typedef Allocator<Node,HEADERCHUNK> Allocator_t;
		// The type of node allocator to use.

	static Allocator_t sm_oNodeAllocator;
		// The default node allocator.

	SkipList (const PRED &a_rPred = PRED(),
			Allocator_t &a_rAlloc = sm_oNodeAllocator);
		// Default constructor.  Must be followed by Init().

	SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,
			uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),
			Allocator_t &a_rAlloc = sm_oNodeAllocator);
		// Constructor.  Specify whether or not duplicates are allowed,
		// and provide a random number seed.



private:
	
	Allocator_t &m_rNodeAllocator;
		// Where we get memory to allocate nodes.

	bool m_bAllowDuplicates;


// The default node allocator.  Allocates 64K at a time.
template <class KEY, class VALUE, class KEYFN, class PRED>
typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t
	SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);



// Default constructor.  Must be followed by Init().
template <class KEY, class VALUE, class KEYFN, class PRED>
SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred,
		Allocator_t &a_rAlloc)
	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
{
	// Set up some defaults.

template <class KEY, class VALUE, class KEYFN, class PRED>
SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus,
		bool a_bAllowDuplicates, uint32_t a_nRandSeed,
		const PRED &a_rPred, Allocator_t &a_rAlloc)
	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
{
	// Make sure they didn't start us off with an error.

Return to bug 200767

Lines 57-75 Link Here

(-)mjpegtools-1.9.0rc3-orig/y4mdenoise/SkipList.hh (-8 / +8 lines)
57	// Will give good sorting for up to e^10 items.	57	// Will give good sorting for up to e^10 items.
58		58
59	public:	59	public:
60	typedef Allocator<Node,HEADERCHUNK> Allocator;	60	typedef Allocator<Node,HEADERCHUNK> Allocator_t;
61	// The type of node allocator to use.	61	// The type of node allocator to use.
62		62
63	static Allocator sm_oNodeAllocator;	63	static Allocator_t sm_oNodeAllocator;
64	// The default node allocator.	64	// The default node allocator.
65		65
66	SkipList (const PRED &a_rPred = PRED(),	66	SkipList (const PRED &a_rPred = PRED(),
67	Allocator &a_rAlloc = sm_oNodeAllocator);	67	Allocator_t &a_rAlloc = sm_oNodeAllocator);
68	// Default constructor. Must be followed by Init().	68	// Default constructor. Must be followed by Init().
69		69
70	SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,	70	SkipList (Status_t &a_reStatus, bool a_bAllowDuplicates,
71	uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),	71	uint32_t a_nRandSeed, const PRED &a_rPred = PRED(),
72	Allocator &a_rAlloc = sm_oNodeAllocator);	72	Allocator_t &a_rAlloc = sm_oNodeAllocator);
73	// Constructor. Specify whether or not duplicates are allowed,	73	// Constructor. Specify whether or not duplicates are allowed,
74	// and provide a random number seed.	74	// and provide a random number seed.
75		75
Lines 255-261 Link Here
255		255
256	private:	256	private:
257		257
258	Allocator &m_rNodeAllocator;	258	Allocator_t &m_rNodeAllocator;
259	// Where we get memory to allocate nodes.	259	// Where we get memory to allocate nodes.
260		260
261	bool m_bAllowDuplicates;	261	bool m_bAllowDuplicates;
Lines 337-343 Link Here
337		337
338	// The default node allocator. Allocates 64K at a time.	338	// The default node allocator. Allocates 64K at a time.
339	template <class KEY, class VALUE, class KEYFN, class PRED>	339	template <class KEY, class VALUE, class KEYFN, class PRED>
340	typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator	340	typename SkipList<KEY,VALUE,KEYFN,PRED>::Allocator_t
341	SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);	341	SkipList<KEY,VALUE,KEYFN,PRED>::sm_oNodeAllocator (65536);
342		342
343		343
Lines 345-351 Link Here
345	// Default constructor. Must be followed by Init().	345	// Default constructor. Must be followed by Init().
346	template <class KEY, class VALUE, class KEYFN, class PRED>	346	template <class KEY, class VALUE, class KEYFN, class PRED>
347	SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred,	347	SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (const PRED &a_rPred,
348	Allocator &a_rAlloc)	348	Allocator_t &a_rAlloc)
349	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)	349	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
350	{	350	{
351	// Set up some defaults.	351	// Set up some defaults.
Lines 371-377 Link Here
371	template <class KEY, class VALUE, class KEYFN, class PRED>	371	template <class KEY, class VALUE, class KEYFN, class PRED>
372	SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus,	372	SkipList<KEY,VALUE,KEYFN,PRED>::SkipList (Status_t &a_reStatus,
373	bool a_bAllowDuplicates, uint32_t a_nRandSeed,	373	bool a_bAllowDuplicates, uint32_t a_nRandSeed,
374	const PRED &a_rPred, Allocator &a_rAlloc)	374	const PRED &a_rPred, Allocator_t &a_rAlloc)
375	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)	375	: m_rNodeAllocator (a_rAlloc), m_oPred (a_rPred)
376	{	376	{
377	// Make sure they didn't start us off with an error.	377	// Make sure they didn't start us off with an error.