X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diffcore.h;h=73c7842cc7fd907519016b936a96b6f08cd80b47;hb=bb996614de4fddfa73286479f3c6a901107a2629;hp=a38acb13e19e0b3bfe9a377fefe4810c9830a11e;hpb=5e80092f7e6db09a40a62e837ca3f74f0bc5ad73;p=git.git

diff --git a/diffcore.h b/diffcore.h
index a38acb13..73c7842c 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -15,10 +15,10 @@
  * passed around in one int (high 16-bit for merge and low 16-bit
  * for break).
  */
-#define MAX_SCORE 60000
+#define MAX_SCORE 60000.0
 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
-#define DEFAULT_BREAK_SCORE  30000 /* minimum for break to happen (50%)*/
-#define DEFAULT_MERGE_SCORE  48000 /* maximum for break-merge to happen (80%)*/
+#define DEFAULT_BREAK_SCORE  30000 /* minimum for break to happen (50%) */
+#define DEFAULT_MERGE_SCORE  36000 /* maximum for break-merge to happen 60%) */
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
@@ -26,6 +26,7 @@ struct diff_filespec {
 	unsigned char sha1[20];
 	char *path;
 	void *data;
+	void *cnt_data;
 	unsigned long size;
 	int xfrm_flags;		 /* for use by the xfrm */
 	unsigned short mode;	 /* file mode */
@@ -101,4 +102,12 @@ void diff_debug_queue(const char *, struct diff_queue_struct *);
 #define diff_debug_queue(a,b) do {} while(0)
 #endif
 
+extern int diffcore_count_changes(void *src, unsigned long src_size,
+				  void *dst, unsigned long dst_size,
+				  void **src_count_p,
+				  void **dst_count_p,
+				  unsigned long delta_limit,
+				  unsigned long *src_copied,
+				  unsigned long *literal_added);
+
 #endif