Attachment #508250 for bug #639926

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




++ compiz-plugins-main-0.8.8/include/compiz-animation.h        2017-12-05 15:08:13.402633155 +0100


#define OPTION_GETTERS(extensionBaseFunctions,                         \
                      extensionPluginInfo, firstEffectOption)          \
extern inline CompOptionValue *                                                \
animGetOptVal (CompWindow *w,                                          \
              int optionId)                                            \
{                                                                      \

       (w, (extensionPluginInfo), optionId - (firstEffectOption));     \
}                                              \
                                               \
extern inline Bool                                     \
animGetB (CompWindow *w,                       \
         int optionId)                         \
{                                              \
    return animGetOptVal (w, optionId)->b;     \
}                                              \
                                               \
extern inline int                                      \
animGetI (CompWindow *w,                       \
         int optionId)                         \
{                                              \
    return animGetOptVal (w, optionId)->i;     \
}                                              \
                                               \
extern inline float                                    \
animGetF (CompWindow *w,                       \
         int optionId)                         \
{                                              \
    return animGetOptVal (w, optionId)->f;     \
}                                              \
                                               \
extern inline char *                                   \
animGetS (CompWindow *w,                       \
         int optionId)                         \
{                                              \
    return animGetOptVal (w, optionId)->s;     \
}                                              \
                                               \
extern inline unsigned short *                         \
animGetC (CompWindow *w,                       \
         int optionId)                         \
{                                              \


#define OPTION_GETTERS_HDR                     \
                                               \
extern inline Bool                                     \
animGetB (CompWindow *w,                       \
         int optionId);                        \
                                               \
extern inline int                                      \
animGetI (CompWindow *w,                       \
         int optionId);                        \
                                               \
extern inline float                                    \
animGetF (CompWindow *w,                       \
         int optionId);                        \
                                               \
extern inline char *                                   \
animGetS (CompWindow *w,                       \
         int optionId);                        \
                                               \
extern inline unsigned short *                         \
animGetC (CompWindow *w,                       \
         int optionId);


Lines 742-748 Link Here

(-)compiz-plugins-main-0.8.8.orig/src/animation/animation.c (-1 / +1 lines)
742	}	742	}
743		743
744	// Apply transform to wTransform	744	// Apply transform to wTransform
745	inline void	745	extern inline void
746	applyTransform (CompTransform *wTransform,	746	applyTransform (CompTransform *wTransform,
747	CompTransform *transform)	747	CompTransform *transform)
748	{	748	{

Lines 429-435 Link Here

(-)compiz-plugins-main-0.8.8.orig/src/animation/animation-internal.h (-2 / +2 lines)
429	CompTransform *transform,	429	CompTransform *transform,
430	Point *center);	430	Point *center);
431		431
432	inline void	432	extern inline void
433	applyTransform (CompTransform *wTransform,	433	applyTransform (CompTransform *wTransform,
434	CompTransform *transform);	434	CompTransform *transform);
435		435
Lines 613-619 Link Here
613	Bool	613	Bool
614	fxZoomInit (CompWindow * w);	614	fxZoomInit (CompWindow * w);
615		615
616	void	616	extern inline void
617	applyZoomTransform (CompWindow * w);	617	applyZoomTransform (CompWindow * w);
618		618
619	void	619	void

Lines 243-249 Link Here

(-)compiz-plugins-main-0.8.8.orig/src/animation/zoomside.c (-1 / +1 lines)
243	(GLushort) (aw->com.storedOpacity * (1 - forwardProgress));	243	(GLushort) (aw->com.storedOpacity * (1 - forwardProgress));
244	}	244	}
245		245
246	static void	246	extern void
247	getZoomCenterScaleFull (CompWindow *w,	247	getZoomCenterScaleFull (CompWindow *w,
248	Point pCurCenter, Point pCurScale,	248	Point pCurCenter, Point pCurScale,
249	Point pWinCenter, Point pIconCenter,	249	Point pWinCenter, Point pIconCenter,

Return to bug 639926

Line Link Here

(-)file_not_specified_in_diff (-12 / +12 lines)
0	-- compiz-plugins-main-0.8.8.orig/include/compiz-animation.h 2011-04-21 12:20:09.000000000 +0200	0	++ compiz-plugins-main-0.8.8/include/compiz-animation.h 2017-12-05 15:08:13.402633155 +0100
Lines 215-221 Link Here
215		215
216	#define OPTION_GETTERS(extensionBaseFunctions, \	216	#define OPTION_GETTERS(extensionBaseFunctions, \
217	extensionPluginInfo, firstEffectOption) \	217	extensionPluginInfo, firstEffectOption) \
218	static inline CompOptionValue * \	218	extern inline CompOptionValue * \
219	animGetOptVal (CompWindow *w, \	219	animGetOptVal (CompWindow *w, \
220	int optionId) \	220	int optionId) \
221	{ \	221	{ \
Lines 223-257 Link Here
223	(w, (extensionPluginInfo), optionId - (firstEffectOption)); \	223	(w, (extensionPluginInfo), optionId - (firstEffectOption)); \
224	} \	224	} \
225	\	225	\
226	inline Bool \	226	extern inline Bool \
227	animGetB (CompWindow *w, \	227	animGetB (CompWindow *w, \
228	int optionId) \	228	int optionId) \
229	{ \	229	{ \
230	return animGetOptVal (w, optionId)->b; \	230	return animGetOptVal (w, optionId)->b; \
231	} \	231	} \
232	\	232	\
233	inline int \	233	extern inline int \
234	animGetI (CompWindow *w, \	234	animGetI (CompWindow *w, \
235	int optionId) \	235	int optionId) \
236	{ \	236	{ \
237	return animGetOptVal (w, optionId)->i; \	237	return animGetOptVal (w, optionId)->i; \
238	} \	238	} \
239	\	239	\
240	inline float \	240	extern inline float \
241	animGetF (CompWindow *w, \	241	animGetF (CompWindow *w, \
242	int optionId) \	242	int optionId) \
243	{ \	243	{ \
244	return animGetOptVal (w, optionId)->f; \	244	return animGetOptVal (w, optionId)->f; \
245	} \	245	} \
246	\	246	\
247	inline char * \	247	extern inline char * \
248	animGetS (CompWindow *w, \	248	animGetS (CompWindow *w, \
249	int optionId) \	249	int optionId) \
250	{ \	250	{ \
251	return animGetOptVal (w, optionId)->s; \	251	return animGetOptVal (w, optionId)->s; \
252	} \	252	} \
253	\	253	\
254	inline unsigned short * \	254	extern inline unsigned short * \
255	animGetC (CompWindow *w, \	255	animGetC (CompWindow *w, \
256	int optionId) \	256	int optionId) \
257	{ \	257	{ \
Lines 260-282 Link Here
260		260
261	#define OPTION_GETTERS_HDR \	261	#define OPTION_GETTERS_HDR \
262	\	262	\
263	inline Bool \	263	extern inline Bool \
264	animGetB (CompWindow *w, \	264	animGetB (CompWindow *w, \
265	int optionId); \	265	int optionId); \
266	\	266	\
267	inline int \	267	extern inline int \
268	animGetI (CompWindow *w, \	268	animGetI (CompWindow *w, \
269	int optionId); \	269	int optionId); \
270	\	270	\
271	inline float \	271	extern inline float \
272	animGetF (CompWindow *w, \	272	animGetF (CompWindow *w, \
273	int optionId); \	273	int optionId); \
274	\	274	\
275	inline char * \	275	extern inline char * \
276	animGetS (CompWindow *w, \	276	animGetS (CompWindow *w, \
277	int optionId); \	277	int optionId); \
278	\	278	\
279	inline unsigned short * \	279	extern inline unsigned short * \
280	animGetC (CompWindow *w, \	280	animGetC (CompWindow *w, \
281	int optionId);	281	int optionId);
282		282