ObjFW  Diff

Differences From Artifact [43c18460ed]:

To Artifact [ad55e4debc]:


233
234
235
236
237
238
239
240

241
242
243
244

245
246
247
248
249
250

251
252
253

254
255
256
257
258
259

260
261
262


263
264

265
266
267
268
269

270
271
272
273
274
275
276


277
278
279
280

281
282

283
284
285

286
287
288
289
290
291
292
233
234
235
236
237
238
239

240
241
242
243

244
245
246
247
248
249

250
251
252

253
254
255
256
257
258

259
260


261
262
263

264
265
266
267
268

269
270
271
272
273
274


275
276
277
278
279

280
281

282
283
284

285
286
287
288
289
290
291
292







-
+



-
+





-
+


-
+





-
+

-
-
+
+

-
+




-
+





-
-
+
+



-
+

-
+


-
+







	if (size1.height != size2.height)
		return false;

	return true;
}

/**
 * @struct of_rectangle_t OFObject.h ObjFW/OFObject.h
 * @struct OFRect OFObject.h ObjFW/OFObject.h
 *
 * @brief A rectangle.
 */
struct OF_BOXABLE of_rectangle_t {
struct OF_BOXABLE OFRect {
	/** The point from where the rectangle originates */
	OFPoint origin;
	/** The size of the rectangle */
	OFSize size;
};
typedef struct of_rectangle_t of_rectangle_t;
typedef struct OFRect OFRect;

/**
 * @brief Creates a new of_rectangle_t.
 * @brief Creates a new OFRect.
 *
 * @param x The x coordinate of the top left corner of the rectangle
 * @param y The y coordinate of the top left corner of the rectangle
 * @param width The width of the rectangle
 * @param height The height of the rectangle
 * @return An of_rectangle_t with the specified origin and size
 * @return An OFRect with the specified origin and size
 */
static OF_INLINE of_rectangle_t OF_CONST_FUNC
of_rectangle(float x, float y, float width, float height)
static OF_INLINE OFRect OF_CONST_FUNC
OFMakeRect(float x, float y, float width, float height)
{
	of_rectangle_t rectangle = {
	OFRect rect = {
		OFMakePoint(x, y),
		OFMakeSize(width, height)
	};

	return rectangle;
	return rect;
}

/**
 * @brief Returns whether the two rectangles are equal.
 *
 * @param rectangle1 The first rectangle for the comparison
 * @param rectangle2 The second rectangle for the comparison
 * @param rect1 The first rectangle for the comparison
 * @param rect2 The second rectangle for the comparison
 * @return Whether the two rectangles are equal
 */
static OF_INLINE bool
of_rectangle_equal(of_rectangle_t rectangle1, of_rectangle_t rectangle2)
OFEqualRects(OFRect rect1, OFRect rect2)
{
	if (!OFEqualPoints(rectangle1.origin, rectangle2.origin))
	if (!OFEqualPoints(rect1.origin, rect2.origin))
		return false;

	if (!OFEqualSizes(rectangle1.size, rectangle2.size))
	if (!OFEqualSizes(rect1.size, rect2.size))
		return false;

	return true;
}

#ifdef __OBJC__
@class OFMethodSignature;